GC unused flag and methods

largeRankExpressionLimit() can be used to control use of external rank
expressions if needed

2 files changed, 3 insertions, 17 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index 9690f00a209..4bf20e75a5d 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -1,4 +1,4 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.model.deploy;
 
 import com.google.common.collect.ImmutableList;
@@ -50,7 +50,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private boolean useAsyncMessageHandlingOnSchedule = false;
     private double feedConcurrency = 0.5;
     private boolean enableFeedBlockInDistributor = true;
-    private boolean useExternalRankExpression = true;
     private boolean enforceRankProfileInheritance = true;
     private int maxActivationInhibitedOutOfSyncGroups = 0;
     private List<TenantSecretStore> tenantSecretStores = Collections.emptyList();
@@ -99,8 +98,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public int numDistributorStripes() { return numDistributorStripes; }
     @Override public boolean allowDisableMtls() { return allowDisableMtls; }
     @Override public List<X509Certificate> operatorCertificates() { return operatorCertificates; }
-    @Override public boolean useExternalRankExpressions() { return useExternalRankExpression; }
-    @Override public boolean distributeExternalRankExpressions() { return useExternalRankExpression; }
     @Override public int largeRankExpressionLimit() { return largeRankExpressionLimit; }
     @Override public int maxConcurrentMergesPerNode() { return maxConcurrentMergesPerNode; }
     @Override public int maxMergeQueueSize() { return maxMergeQueueSize; }
@@ -114,10 +111,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         enforceRankProfileInheritance = value;
         return this;
     }
-    public TestProperties useExternalRankExpression(boolean value) {
-        useExternalRankExpression = value;
-        return this;
-    }
     public TestProperties largeRankExpressionLimit(int value) {
         largeRankExpressionLimit = value;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java
index 792965314c5..d607f878f95 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/RawRankProfile.java
@@ -1,4 +1,4 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.derived;
 
 import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModels;
@@ -139,8 +139,6 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
         private final double termwiseLimit;
         private final double rankScoreDropLimit;
         private final int largeRankExpressionLimit;
-        private final boolean distributeLargeRankExpressions;
-        private final boolean useDistributedRankExpressions;
 
         /**
          * The rank type definitions used to derive settings for the native rank features
@@ -176,8 +174,6 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
             rankScoreDropLimit = compiled.getRankScoreDropLimit();
             ignoreDefaultRankFeatures = compiled.getIgnoreDefaultRankFeatures();
             largeRankExpressionLimit = deployProperties.featureFlags().largeRankExpressionLimit();
-            distributeLargeRankExpressions = deployProperties.featureFlags().distributeExternalRankExpressions();
-            useDistributedRankExpressions = deployProperties.featureFlags().useExternalRankExpressions();
             rankProperties = new ArrayList<>(compiled.getRankProperties());
 
             Map<String, RankProfile.RankingExpressionFunction> functions = compiled.getFunctions();
@@ -413,7 +409,6 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
         }
 
         private void distributeLargeExpressionsAsFiles(List<Pair<String, String>> properties, LargeRankExpressions largeRankExpressions) {
-            if (!distributeLargeRankExpressions) return;
             for (ListIterator<Pair<String, String>> iter = properties.listIterator(); iter.hasNext();) {
                 Pair<String, String> property = iter.next();
                 String expression = property.getSecond();
@@ -423,9 +418,7 @@ public class RawRankProfile implements RankProfilesConfig.Producer {
                     if (functionName != null) {
                         String mangledName = rankprofileName + "." + functionName;
                         largeRankExpressions.add(new RankExpressionBody(mangledName, ByteBuffer.wrap(expression.getBytes(StandardCharsets.UTF_8))));
-                        if (useDistributedRankExpressions) {
-                            iter.set(new Pair<>(RankingExpression.propertyExpressionName(functionName), mangledName));
-                        }
+                        iter.set(new Pair<>(RankingExpression.propertyExpressionName(functionName), mangledName));
                     }
                 }
             }