remove unused code

4 files changed, 0 insertions, 62 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/Index.java b/container-search/src/main/java/com/yahoo/prelude/Index.java
index 109ecfd29f8..8433939090b 100644
--- a/container-search/src/main/java/com/yahoo/prelude/Index.java
+++ b/container-search/src/main/java/com/yahoo/prelude/Index.java
@@ -53,7 +53,6 @@ public class Index {
     private boolean uriIndex = false;
     private boolean hostIndex = false;
     private StemMode stemMode = StemMode.NONE;
-    private Attribute[] matchGroup = null;
     private boolean isAttribute = false;
     private boolean isDefaultPosition = false;
     private boolean dynamicSummary=false;
@@ -165,8 +164,6 @@ public class Index {
             setAttribute(true);
         } else if (commandString.equals("default-position")) {
             setDefaultPosition(true);
-        } else if (commandString.startsWith("match-group ")) {
-            setMatchGroup(commandString.substring(12).split(" "));
         } else if (commandString.equals("plain-tokens")) {
             setPlainTokens(true);
         } else if (commandString.equals("multivalue")) {
@@ -269,19 +266,6 @@ public class Index {
         return "(null)".equals(name);
     }
 
-    public Attribute[] getMatchGroup() { // TODO: Not in use on Vespa 6
-        return matchGroup;
-    }
-
-    public void setMatchGroup(String[] attributes) {
-        Attribute[] a = new Attribute[attributes.length];
-
-        for (int i = 0; i < attributes.length; i++) {
-            a[i] = new Attribute(attributes[i].trim());
-        }
-        this.matchGroup = a;
-    }
-
     public boolean isAttribute() {
         return isAttribute;
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/IndexModel.java b/container-search/src/main/java/com/yahoo/prelude/IndexModel.java
index db37922f6fb..dd2bd1ee2f1 100644
--- a/container-search/src/main/java/com/yahoo/prelude/IndexModel.java
+++ b/container-search/src/main/java/com/yahoo/prelude/IndexModel.java
@@ -92,7 +92,6 @@ public final class IndexModel {
                 IndexInfoConfig.Indexinfo.Command command = j.next();
                 sd.addCommand(command.indexname(),command.command());
             }
-            sd.fillMatchGroups();
             searchDefinitions.put(info.name(), sd);
         }
 
@@ -129,7 +128,6 @@ public final class IndexModel {
             }
 
         }
-        union.fillMatchGroups();
         return union;
     }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java b/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
index aa76bd5912a..7859a9698d9 100644
--- a/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
+++ b/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
@@ -96,19 +96,4 @@ public class SearchDefinition {
         }
     }
 
-    public void fillMatchGroups() {
-        for (Index i : indices.values()) {
-            Attribute[] matchGroup = i.getMatchGroup();
-            if (matchGroup == null) {
-                continue;
-            }
-            for (Attribute a : matchGroup) {
-                Index m = getIndex(a.name);
-                if (m != null) {
-                    a.setTokenizedContent(!m.isAttribute());
-                }
-            }
-        }
-    }
-
 }
diff --git a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/indexcombinator.cfg b/container-search/src/test/java/com/yahoo/prelude/querytransform/test/indexcombinator.cfg
deleted file mode 100644
index a8790cc4051..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/querytransform/test/indexcombinator.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-indexinfo[1]
-indexinfo[0].name combinedattributeandindexsearch
-indexinfo[0].command[12]
-indexinfo[0].command[0].indexname sddocname
-indexinfo[0].command[0].command index
-indexinfo[0].command[1].indexname index1
-indexinfo[0].command[1].command index
-indexinfo[0].command[2].indexname default
-indexinfo[0].command[2].command index
-indexinfo[0].command[3].indexname index1
-indexinfo[0].command[3].command stem
-indexinfo[0].command[4].indexname default
-indexinfo[0].command[4].command stem
-indexinfo[0].command[5].indexname index1
-indexinfo[0].command[5].command index1
-indexinfo[0].command[5].command normalize
-indexinfo[0].command[6].indexname default
-indexinfo[0].command[6].command normalize
-indexinfo[0].command[7].indexname attribute1
-indexinfo[0].command[7].command index
-indexinfo[0].command[8].indexname attribute1
-indexinfo[0].command[8].command attribute
-indexinfo[0].command[9].indexname attribute2
-indexinfo[0].command[9].command attribute
-indexinfo[0].command[10].indexname default
-indexinfo[0].command[10].command "match-group default attribute1 attribute2"
-indexinfo[0].command[11].indexname ranklog
-indexinfo[0].command[11].command xmlstring
-