Merge pull request #12664 from vespa-engine/bratseth/dont-use-phrase-segmentation-flag

Bratseth/dont use phrase segmentation flag

7 files changed, 14 insertions, 96 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index 802fdcc1dda..e37b0b07746 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -43,7 +43,6 @@ public class TestProperties implements ModelContext.Properties {
     private double defaultTermwiseLimit = 1.0;
     private Optional<EndpointCertificateSecrets> endpointCertificateSecrets = Optional.empty();
     private boolean useNewAthenzFilter = false;
-    private boolean usePhraseSegmenting = false;
     private boolean useDedicatedNodesWhenUnspecified = false;
     private AthenzDomain athenzDomain;
 
@@ -66,7 +65,6 @@ public class TestProperties implements ModelContext.Properties {
     @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
     @Override public boolean useBucketSpaceMetric() { return true; }
     @Override public boolean useNewAthenzFilter() { return useNewAthenzFilter; }
-    @Override public boolean usePhraseSegmenting() { return usePhraseSegmenting; }
     @Override public boolean useDedicatedNodesWhenUnspecified() { return useDedicatedNodesWhenUnspecified; }
     @Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); }
 
@@ -120,11 +118,6 @@ public class TestProperties implements ModelContext.Properties {
         return this;
     }
 
-    public TestProperties setUsePhraseSegmenting(boolean phraseSegmenting) {
-        this.usePhraseSegmenting = phraseSegmenting;
-        return this;
-    }
-
     public TestProperties setUseDedicatedNodesWhenUnspecified(boolean useDedicatedNodesWhenUnspecified) {
         this.useDedicatedNodesWhenUnspecified = useDedicatedNodesWhenUnspecified;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
index b16f8c0e5bb..fc8710fa1a1 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/DerivedConfiguration.java
@@ -87,7 +87,7 @@ public class DerivedConfiguration {
             juniperrc = new Juniperrc(search);
             rankProfileList = new RankProfileList(search, search.rankingConstants(), attributeFields, rankProfileRegistry, queryProfiles, importedModels, deployProperties);
             indexingScript = new IndexingScript(search);
-            indexInfo = new IndexInfo(search, deployProperties);
+            indexInfo = new IndexInfo(search);
             indexSchema = new IndexSchema(search);
             importedFields = new ImportedFields(search);
         }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
index 9ae72badf1c..a631aa19968 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexInfo.java
@@ -1,11 +1,18 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.derived;
 
-import com.yahoo.config.model.api.ModelContext;
-import com.yahoo.document.*;
+import com.yahoo.document.CollectionDataType;
+import com.yahoo.document.DataType;
+import com.yahoo.document.NumericDataType;
+import com.yahoo.document.PositionDataType;
 import com.yahoo.searchdefinition.Index;
 import com.yahoo.searchdefinition.Search;
-import com.yahoo.searchdefinition.document.*;
+import com.yahoo.searchdefinition.document.Attribute;
+import com.yahoo.searchdefinition.document.BooleanIndexDefinition;
+import com.yahoo.searchdefinition.document.FieldSet;
+import com.yahoo.searchdefinition.document.ImmutableSDField;
+import com.yahoo.searchdefinition.document.Matching;
+import com.yahoo.searchdefinition.document.Stemming;
 import com.yahoo.searchdefinition.processing.ExactMatch;
 import com.yahoo.searchdefinition.processing.NGramMatch;
 import com.yahoo.vespa.documentmodel.SummaryField;
@@ -43,11 +50,9 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
     private Map<String, String> aliases = new java.util.LinkedHashMap<>();
     private Map<String, FieldSet> fieldSets;
     private Search search;
-    private final boolean phraseSegmenting;
 
-    public IndexInfo(Search search, ModelContext.Properties deployProperties) {
+    public IndexInfo(Search search) {
         this.fieldSets = search.fieldSets().userFieldSets();
-        this.phraseSegmenting = deployProperties.usePhraseSegmenting();
         addIndexCommand("sddocname", CMD_INDEX);
         addIndexCommand("sddocname", CMD_WORD);
         derive(search);
@@ -158,10 +163,6 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
             addIndexCommand(field, CMD_NUMERICAL);
         }
 
-        if (phraseSegmenting) {
-            addIndexCommand(field, CMD_PHRASE_SEGMENTING);
-        }
-
         // Explicit commands
         for (String command : field.getQueryCommands()) {
             addIndexCommand(field, command);
@@ -413,14 +414,6 @@ public class IndexInfo extends Derived implements IndexInfoConfig.Producer {
                 
             }
         }
-
-        if (phraseSegmentingCommand == null
-            && fieldSet.queryCommands().stream().noneMatch(c -> c.startsWith(CMD_PHRASE_SEGMENTING))) { // use default
-            if (phraseSegmenting)
-                iiB.command(new IndexInfoConfig.Indexinfo.Command.Builder()
-                                    .indexname(fieldSet.getName())
-                                    .command(CMD_PHRASE_SEGMENTING));
-        }
     }
 
     private boolean hasMultiValueField(FieldSet fieldSet) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index 61d0cd7cd1e..5629956e8b9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -91,8 +91,8 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
     private NodesSpecification createNodesSpecificationForLogserver() {
         DeployState deployState = context.getDeployState();
         if (deployState.getProperties().useDedicatedNodeForLogserver() &&
-                context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT &&
-                deployState.isHosted())
+            context.getApplicationType() == ConfigModelContext.ApplicationType.DEFAULT &&
+            deployState.isHosted())
             return NodesSpecification.dedicated(1, context);
         else
             return NodesSpecification.nonDedicated(1, context);
diff --git a/config-model/src/test/derived/fieldset2/index-info.cfg b/config-model/src/test/derived/fieldset2/index-info.cfg
deleted file mode 100644
index 56cc53b4628..00000000000
--- a/config-model/src/test/derived/fieldset2/index-info.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-indexinfo[].name "test"
-indexinfo[].command[].indexname "sddocname"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "sddocname"
-indexinfo[].command[].command "word"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "lowercase"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "stem:BEST"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "normalize"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "plain-tokens"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "phrase-segmenting"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "lowercase"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "stem:BEST"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "normalize"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "plain-tokens"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "phrase-segmenting"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "phrase-segmenting false"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "lowercase"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "plain-tokens"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "stem:BEST"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "normalize"
diff --git a/config-model/src/test/derived/fieldset2/test.sd b/config-model/src/test/derived/fieldset2/test.sd
deleted file mode 100644
index 7606a5d16b2..00000000000
--- a/config-model/src/test/derived/fieldset2/test.sd
+++ /dev/null
@@ -1,20 +0,0 @@
-search test {
-
-  document test {
-
-    field field1 type string {
-        indexing: index
-    }
-
-    field field2 type string {
-        indexing: index
-    }
-
-  }
-
-  fieldset default {
-      fields: field1, field2
-      query-command: "phrase-segmenting false"
-  }
-
-}
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 08d915c35ca..3c55aa808b5 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -121,13 +121,6 @@ public class ExportingTestCase extends AbstractExportingTestCase {
     }
 
     @Test
-    public void testFieldSet2() throws IOException, ParseException {
-        TestProperties properties = new TestProperties();
-        properties.setUsePhraseSegmenting(true);
-        assertCorrectDeriving("fieldset2", null, properties);
-    }
-
-    @Test
     public void testIndexinfoFieldsets() throws IOException, ParseException {
         assertCorrectDeriving("indexinfo_fieldsets");
     }