Merge pull request #19037 from vespa-engine/hmusum/distribute-large-rank-expressions-by-default

Set default value for DISTRIBUTE_EXTERNAL_RANK_EXPRESSION to true

2 files changed, 3 insertions, 4 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index 8ef04752800..12263521dcb 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -9,7 +9,6 @@ import org.junit.Test;
 import java.io.IOException;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 /**
  * Tests exporting
@@ -106,7 +105,7 @@ public class ExportingTestCase extends AbstractExportingTestCase {
     @Test
     public void testRankExpression() throws IOException, ParseException {
         assertCorrectDeriving("rankexpression", null,
-                new TestProperties().useExternalRankExpression(true).largeRankExpressionLimit(1024), new TestableDeployLogger());
+                new TestProperties().largeRankExpressionLimit(1024), new TestableDeployLogger());
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
index 00ac5ac5405..b81fe7a02cc 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/RankingExpressionsTestCase.java
@@ -36,7 +36,7 @@ public class RankingExpressionsTestCase extends SchemaTestCase {
 
     @Test
     public void testFunctions() throws IOException, ParseException {
-        ModelContext.Properties deployProperties = new TestProperties().useExternalRankExpression(true);
+        ModelContext.Properties deployProperties = new TestProperties();
         RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
         Search search = createSearch("src/test/examples/rankingexpressionfunction", deployProperties, rankProfileRegistry);
         RankProfile functionsRankProfile = rankProfileRegistry.get(search, "macros");
@@ -115,7 +115,7 @@ public class RankingExpressionsTestCase extends SchemaTestCase {
 
     @Test
     public void testLargeInheritedFunctions() throws IOException, ParseException {
-        ModelContext.Properties properties = new TestProperties().useExternalRankExpression(true).largeRankExpressionLimit(50);
+        ModelContext.Properties properties = new TestProperties().largeRankExpressionLimit(50);
         RankProfileRegistry rankProfileRegistry = new RankProfileRegistry();
         LargeRankExpressions largeExpressions = new LargeRankExpressions(new MockFileRegistry());
         QueryProfileRegistry queryProfiles = new QueryProfileRegistry();