Also add option to turn split optimisation off.

2 files changed, 3 insertions, 1 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 {",