diff options
3 files changed, 4 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..da7d75ac856 100644 --- a/config-model/src/main/java/com/yahoo/schema/RankProfile.java +++ b/config-model/src/main/java/com/yahoo/schema/RankProfile.java @@ -162,9 +162,6 @@ public class RankProfile implements Cloneable { 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")); - } } public String name() { return name; } 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..1c52ceadecd 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; @@ -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 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 9bafcc699bb..f4d6d2c3e86 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 'delay', 'spilt' or both", + "Select phase optimization, valid values are 'spilt'.", "Takes effect at redeployment", ZONE_ID, APPLICATION_ID); |