Merge pull request #33219 from vespa-engine/hmusum/remove-default-termwise-limit-feature-flag

Stop using feature flag DEFAULT_TERM_WISE_LIMIT

Author: hmusum

config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java

@@ -74,7 +74,7 @@ public interface ModelContext {
      *  - Remove all flag data files from hosted-feature-flag repository
      */
     interface FeatureFlags {
-        @ModelFeatureFlag(owners = {"baldersheim"}, comment = "Revisit in May or June 2024") default double defaultTermwiseLimit() { throw new UnsupportedOperationException("TODO specify default value"); }
+        @ModelFeatureFlag(owners = {"baldersheim"}, removeAfter = "8.473") default double defaultTermwiseLimit() { return 1.0; }
         @ModelFeatureFlag(owners = {"baldersheim"}, comment = "Select sequencer type use while feeding") default String feedSequencerType() { return "THROUGHPUT"; }
         @ModelFeatureFlag(owners = {"baldersheim"}) default String responseSequencerType() { throw new UnsupportedOperationException("TODO specify default value"); }
         @ModelFeatureFlag(owners = {"hmusum"}, removeAfter = "8.473") default String queryDispatchPolicy() { return "adaptive"; }

config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java

@@ -40,7 +40,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private Zone zone = Zone.defaultZone();
     private Set<ContainerEndpoint> endpoints = Set.of();
     private boolean useDedicatedNodeForLogserver = false;
-    private double defaultTermwiseLimit = 1.0;
     private String jvmGCOptions = null;
     private String summaryDecodePolicy = "eager";
     private String sequencerType = "THROUGHPUT";
@@ -104,7 +103,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public boolean isFirstTimeDeployment() { return firstTimeDeployment; }
     @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; }
     @Override public Optional<EndpointCertificateSecrets> endpointCertificateSecrets() { return endpointCertificateSecrets; }
-    @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
     @Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); }
     @Override public String responseSequencerType() { return responseSequencerType; }
     @Override public int defaultNumResponseThreads() { return responseNumThreads; }
@@ -217,11 +215,6 @@ public TestProperties setResponseNumThreads(int numThreads) {
         return this;
     }
 
-    public TestProperties setDefaultTermwiseLimit(double limit) {
-        defaultTermwiseLimit = limit;
-        return this;
-    }
-
     public TestProperties setApplicationId(ApplicationId applicationId) {
         this.applicationId = applicationId;
         return this;

config-model/src/main/java/com/yahoo/schema/derived/RawRankProfile.java

@@ -218,7 +218,7 @@ private static class Deriver {
             numThreadsPerSearch = compiled.getNumThreadsPerSearch();
             minHitsPerThread = compiled.getMinHitsPerThread();
             numSearchPartitions = compiled.getNumSearchPartitions();
-            termwiseLimit = compiled.getTermwiseLimit().orElse(deployProperties.featureFlags().defaultTermwiseLimit());
+            termwiseLimit = compiled.getTermwiseLimit().orElse(1.0);
             sortBlueprintsByCost = deployProperties.featureFlags().sortBlueprintsByCost();
             alwaysMarkPhraseExpensive = deployProperties.featureFlags().alwaysMarkPhraseExpensive();
             postFilterThreshold = compiled.getPostFilterThreshold();

config-model/src/test/java/com/yahoo/schema/RankProfileTestCase.java

@@ -308,11 +308,9 @@ private String createSD(Double termwiseLimit) {
     }
 
     @Test
-    void testTermwiseLimitWithDeployOverride() throws ParseException {
+    void testTermwiseLimit() throws ParseException {
         verifyTermwiseLimitAndSomeMoreIncludingInheritance(new TestProperties(), createSD(null), null);
         verifyTermwiseLimitAndSomeMoreIncludingInheritance(new TestProperties(), createSD(0.78), 0.78);
-        verifyTermwiseLimitAndSomeMoreIncludingInheritance(new TestProperties().setDefaultTermwiseLimit(0.09), createSD(null), 0.09);
-        verifyTermwiseLimitAndSomeMoreIncludingInheritance(new TestProperties().setDefaultTermwiseLimit(0.09), createSD(0.37), 0.37);
     }
 
     private void verifyTermwiseLimitAndSomeMoreIncludingInheritance(ModelContext.Properties deployProperties, String sd, Double termwiseLimit) throws ParseException {

configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java

@@ -166,7 +166,6 @@ public ExecutorService getExecutor() {
     public static class FeatureFlags implements ModelContext.FeatureFlags {
 
         private final double queryDispatchWarmup;
-        private final double defaultTermwiseLimit;
         private final String feedSequencer;
         private final String responseSequencer;
         private final int numResponseThreads;
@@ -217,7 +216,6 @@ public static class FeatureFlags implements ModelContext.FeatureFlags {
         private final int documentV1QueueSize;
 
         public FeatureFlags(FlagSource source, ApplicationId appId, Version version) {
-            this.defaultTermwiseLimit = Flags.DEFAULT_TERM_WISE_LIMIT.bindTo(source).with(appId).with(version).value();
             this.feedSequencer = Flags.FEED_SEQUENCER_TYPE.bindTo(source).with(appId).with(version).value();
             this.responseSequencer = Flags.RESPONSE_SEQUENCER_TYPE.bindTo(source).with(appId).with(version).value();
             this.numResponseThreads = Flags.RESPONSE_NUM_THREADS.bindTo(source).with(appId).with(version).value();
@@ -272,7 +270,6 @@ public FeatureFlags(FlagSource source, ApplicationId appId, Version version) {
         @Override public int heapSizePercentage() { return heapPercentage; }
         @Override public double queryDispatchWarmup() { return queryDispatchWarmup; }
         @Override public String summaryDecodePolicy() { return summaryDecodePolicy; }
-        @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
         @Override public String feedSequencerType() { return feedSequencer; }
         @Override public String responseSequencerType() { return responseSequencer; }
         @Override public int defaultNumResponseThreads() { return numResponseThreads; }

flags/src/main/java/com/yahoo/vespa/flags/Flags.java

@@ -62,13 +62,6 @@ public class Flags {
             "Takes effect immediately",
             HOSTNAME, NODE_TYPE);
 
-    public static final UnboundDoubleFlag DEFAULT_TERM_WISE_LIMIT = defineDoubleFlag(
-            "default-term-wise-limit", 1.0,
-            List.of("baldersheim"), "2020-12-02", "2025-03-01",
-            "Default limit for when to apply termwise query evaluation",
-            "Takes effect at redeployment",
-            INSTANCE_ID);
-
     public static final UnboundStringFlag SUMMARY_DECODE_POLICY = defineStringFlag(
             "summary-decode-policy", "eager",
             List.of("baldersheim"), "2023-03-30", "2025-03-01",