diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-08-31 11:43:56 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-08-31 11:43:56 +0200 |
commit | 6045bfe039fc3f79119d921ad3945de8dcbffedc (patch) | |
tree | 20144b3b4b5669afb006234b76ef42ce8dd873d5 | |
parent | aaea16ab173adbab176cf969fcb7c7e534af3c73 (diff) |
Also add option to turn split optimisation off.
3 files changed, 4 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/RankProfile.java b/config-model/src/main/java/com/yahoo/schema/RankProfile.java index da7d75ac856..dc7605c4897 100644 --- a/config-model/src/main/java/com/yahoo/schema/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.java @@ -161,6 +161,8 @@ public class RankProfile implements Cloneable { this.deployLogger = deployLogger; if (deployProperties.featureFlags().phraseOptimization().contains("split")) { addRankProperty(new RankProperty("vespa.matching.split_unpacking_iterators", "true")); + } else if (deployProperties.featureFlags().phraseOptimization().contains("off")) { + addRankProperty(new RankProperty("vespa.matching.split_unpacking_iterators", "false")); } } diff --git a/config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java b/config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java index 1c52ceadecd..b538d834df9 100644 --- a/config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java @@ -81,7 +81,7 @@ public class RankPropertiesTestCase extends AbstractSchemaTestCase { @Test public void testDefaultRankProperties() throws ParseException { RankProfileRegistry rankProfileRegistry = new RankProfileRegistry(); - ApplicationBuilder builder = new ApplicationBuilder(rankProfileRegistry, new QueryProfileRegistry(), new TestProperties().setPhraseOptimization("split delay")); + ApplicationBuilder builder = new ApplicationBuilder(rankProfileRegistry, new QueryProfileRegistry(), new TestProperties().setPhraseOptimization("split")); builder.addSchema(joinLines( "search test {", " document test {", diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index f4d6d2c3e86..d4d3c02cce3 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -73,7 +73,7 @@ public class Flags { public static final UnboundStringFlag PHRASE_OPTIMIZATION = defineStringFlag( "phrase-optimization", "split", List.of("baldersheim"), "2022-08-28", "2023-01-01", - "Select phase optimization, valid values are 'spilt'.", + "Select phase optimization, valid values are 'spilt', 'off'.", "Takes effect at redeployment", ZONE_ID, APPLICATION_ID); |