diff options
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/schema/RankProfile.java | 5 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java | 11 |
2 files changed, 6 insertions, 10 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 acbfed30c4c..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,9 +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")); - } - if (deployProperties.featureFlags().phraseOptimization().contains("delay")) { - addRankProperty(new RankProperty("vespa.matching.delay_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 b51d62defaf..b538d834df9 100644 --- a/config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java +++ b/config-model/src/test/java/com/yahoo/schema/RankPropertiesTestCase.java @@ -8,7 +8,6 @@ import com.yahoo.schema.derived.AttributeFields; import com.yahoo.schema.derived.RawRankProfile; import com.yahoo.schema.parser.ParseException; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels; -import com.yahoo.search.query.ranking.RankProperties; import org.junit.jupiter.api.Test; import java.util.List; @@ -82,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 {", @@ -107,15 +106,13 @@ public class RankPropertiesTestCase extends AbstractSchemaTestCase { builder.build(true); Schema schema = builder.getSchema(); List<RankProfile.RankProperty> props = rankProfileRegistry.get(schema, "a").getRankProperties(); - assertEquals(2, props.size()); + assertEquals(1, props.size()); assertEquals(new RankProfile.RankProperty("vespa.matching.split_unpacking_iterators","true"), props.get(0)); - assertEquals(new RankProfile.RankProperty("vespa.matching.delay_unpacking_iterators","true"), props.get(1)); props = rankProfileRegistry.get(schema, "b").getRankProperties(); - assertEquals(3, props.size()); + assertEquals(2, props.size()); assertEquals(new RankProfile.RankProperty("vespa.matching.split_unpacking_iterators","true"), props.get(0)); - assertEquals(new RankProfile.RankProperty("vespa.matching.delay_unpacking_iterators","true"), props.get(1)); - assertEquals(new RankProfile.RankProperty("query(a)","2000"), props.get(2)); + assertEquals(new RankProfile.RankProperty("query(a)","2000"), props.get(1)); } @Test |