Clean up and fix UTs

julian-elastic · julian-elastic · commit 97583444de49 · 2025-07-03T14:42:40.000-04:00
diff --git a/patch.patch b/patch.patch
diff --git a/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java b/x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/MultiClustersIT.java
@@ -431,15 +431,13 @@ public void testLikeIndex() throws Exception {
     }
 
     public void testLikeIndexLegacySettingNoResults() throws Exception {
-        boolean isSupported = clusterHasCapability("POST", "/_query", List.of(), List.of("like_on_index_fields")).orElse(false);
-        if (isSupported == false) {
-            // we require that the admin client supports the like_on_index_fields capability
-            // otherwise we will get an error when trying to toggle the setting
-            // the remote client does not have to support it
-            logger.info("-->  skipping testLikeIndexLegacySettingNoResults, due to missing capability");
-            return;
-        }
-        try (ClusterSettingToggle ignored = new ClusterSettingToggle(adminClient(), "esql.query.string_like_on_index", false, true)) {
+        // the feature is completely supported if both local and remote clusters support it
+        assumeTrue("not supported", clusterHasCapability("POST", "/_query", List.of(), List.of("like_on_index_fields")).orElse(false));
+        try (
+            ClusterSettingToggle ignored = new ClusterSettingToggle(adminClient(), "esql.query.string_like_on_index", false, true);
+            RestClient remoteClient = remoteClusterClient();
+            ClusterSettingToggle ignored2 = new ClusterSettingToggle(remoteClient, "esql.query.string_like_on_index", false, true)
+        ) {
             // test code with the setting changed
             boolean includeCCSMetadata = includeCCSMetadata();
             Map<String, Object> result = run("""
@@ -456,14 +454,10 @@ public void testLikeIndexLegacySettingNoResults() throws Exception {
     }
 
     public void testLikeIndexLegacySettingResults() throws Exception {
-        boolean isSupported = clusterHasCapability("POST", "/_query", List.of(), List.of("like_on_index_fields")).orElse(false);
-        if (isSupported == false) {
-            // we require that the admin client supports the like_on_index_fields capability
-            // otherwise we will get an error when trying to toggle the setting
-            // the remote client does not have to support it
-            logger.info("-->  skipping testLikeIndexLegacySettingNoResults, due to missing capability");
-            return;
-        }
+        // we require that the admin client supports the like_on_index_fields capability
+        // otherwise we will get an error when trying to toggle the setting
+        // the remote client does not have to support it
+        assumeTrue("not supported", clusterHasCapability("POST", "/_query", List.of(), List.of("like_on_index_fields")).orElse(false));
         try (ClusterSettingToggle ignored = new ClusterSettingToggle(adminClient(), "esql.query.string_like_on_index", false, true)) {
             boolean includeCCSMetadata = includeCCSMetadata();
             Map<String, Object> result = run("""
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/ConfigurationTestUtils.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/ConfigurationTestUtils.java
@@ -72,8 +72,7 @@ public static Configuration randomConfiguration(String query, Map<String, Map<St
             profile,
             tables,
             System.nanoTime(),
-            false,
-            true // stringLikeOnIndex, default to true for tests
+            false
         );
     }
 
diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java b/x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java
@@ -429,8 +429,7 @@ public static Configuration configuration(QueryPragmas pragmas, String query) {
             false,
             TABLES,
             System.nanoTime(),
-            false,
-            true // stringLikeOnIndex, default to true for tests
+            false
         );
     }
 
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/ExpressionQueryBuilder.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/io/stream/ExpressionQueryBuilder.java
@@ -24,7 +24,6 @@
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.util.Objects;
 
 import static org.apache.lucene.search.MultiTermQuery.CONSTANT_SCORE_REWRITE;
@@ -88,7 +87,10 @@ public String getWriteableName() {
 
     @Override
     protected void doXContent(XContentBuilder builder, Params params) throws IOException {
-        throw new UnsupportedEncodingException("ExpressionQueryBuilder does not support doXContent");
+        builder.startObject(ENTRY.name); // Use the appropriate query name
+        builder.field("field", fieldName);
+        builder.field("expression", expression.toString());
+        builder.endObject();
     }
 
     @Override
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java
@@ -88,6 +88,7 @@
 import org.elasticsearch.xpack.esql.planner.PlannerUtils;
 import org.elasticsearch.xpack.esql.planner.TestPhysicalOperationProviders;
 import org.elasticsearch.xpack.esql.planner.mapper.Mapper;
+import org.elasticsearch.xpack.esql.plugin.EsqlFlags;
 import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
 import org.elasticsearch.xpack.esql.session.Configuration;
 import org.elasticsearch.xpack.esql.session.EsqlSession;
@@ -715,7 +716,7 @@ void executeSubPlan(
             var searchStats = new DisabledSearchStats();
             var logicalTestOptimizer = new LocalLogicalPlanOptimizer(new LocalLogicalOptimizerContext(configuration, foldCtx, searchStats));
             var physicalTestOptimizer = new TestLocalPhysicalPlanOptimizer(
-                new LocalPhysicalOptimizerContext(configuration, foldCtx, searchStats)
+                new LocalPhysicalOptimizerContext(new EsqlFlags(true), configuration, foldCtx, searchStats)
             );
 
             var csvDataNodePhysicalPlan = PlannerUtils.localPlan(dataNodePlan, logicalTestOptimizer, physicalTestOptimizer);
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/AbstractConfigurationFunctionTestCase.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/AbstractConfigurationFunctionTestCase.java
@@ -55,8 +55,7 @@ private static Configuration randomConfiguration() {
             randomBoolean(),
             Map.of(),
             System.nanoTime(),
-            randomBoolean(),
-            true
+            randomBoolean()
         );
     }
 }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerTests.java
@@ -71,8 +71,7 @@ private Configuration randomLocaleConfig() {
             false,
             Map.of(),
             System.nanoTime(),
-            randomBoolean(),
-            true
+            randomBoolean()
         );
     }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperTests.java
@@ -71,8 +71,7 @@ private Configuration randomLocaleConfig() {
             false,
             Map.of(),
             System.nanoTime(),
-            randomBoolean(),
-            true
+            randomBoolean()
         );
     }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/WildcardLikeListTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/WildcardLikeListTests.java
@@ -25,6 +25,7 @@
 import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
 import org.elasticsearch.xpack.esql.expression.function.scalar.string.regex.WildcardLikeList;
 import org.elasticsearch.xpack.esql.optimizer.rules.physical.local.LucenePushdownPredicates;
+import org.elasticsearch.xpack.esql.plugin.EsqlFlags;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -104,15 +105,15 @@ static Expression buildWildcardLikeList(Source source, List<Expression> args) {
     public void testNotPushableOverCanMatch() {
         TranslationAware translatable = (TranslationAware) buildFieldExpression(testCase);
         assertThat(
-            translatable.translatable(LucenePushdownPredicates.forCanMatch(V_8_17_0, EsqlTestUtils.TEST_CFG)).finish(),
+            translatable.translatable(LucenePushdownPredicates.forCanMatch(V_8_17_0, new EsqlFlags(true))).finish(),
             equalTo(TranslationAware.FinishedTranslatable.NO)
         );
     }
 
     public void testPushable() {
         TranslationAware translatable = (TranslationAware) buildFieldExpression(testCase);
         assertThat(
-            translatable.translatable(LucenePushdownPredicates.from(new EsqlTestUtils.TestSearchStats(), EsqlTestUtils.TEST_CFG)).finish(),
+            translatable.translatable(LucenePushdownPredicates.from(new EsqlTestUtils.TestSearchStats(), new EsqlFlags(true))).finish(),
             equalTo(TranslationAware.FinishedTranslatable.YES)
         );
     }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java
@@ -136,6 +136,7 @@
 import org.elasticsearch.xpack.esql.planner.LocalExecutionPlanner;
 import org.elasticsearch.xpack.esql.planner.PlannerUtils;
 import org.elasticsearch.xpack.esql.planner.mapper.Mapper;
+import org.elasticsearch.xpack.esql.plugin.EsqlFlags;
 import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
 import org.elasticsearch.xpack.esql.querydsl.query.EqualsSyntheticSourceDelegate;
 import org.elasticsearch.xpack.esql.querydsl.query.SingleValueQuery;
@@ -7842,7 +7843,7 @@ private LocalExecutionPlanner.LocalExecutionPlan physicalOperationsFromPhysicalP
         // The TopN needs an estimated row size for the planner to work
         var plans = PlannerUtils.breakPlanBetweenCoordinatorAndDataNode(EstimatesRowSize.estimateRowSize(0, plan), config);
         plan = useDataNodePlan ? plans.v2() : plans.v1();
-        plan = PlannerUtils.localPlan(config, FoldContext.small(), plan, TEST_SEARCH_STATS);
+        plan = PlannerUtils.localPlan(new EsqlFlags(true), config, FoldContext.small(), plan, TEST_SEARCH_STATS);
         ExchangeSinkHandler exchangeSinkHandler = new ExchangeSinkHandler(null, 10, () -> 10);
         LocalExecutionPlanner planner = new LocalExecutionPlanner(
             "test",
@@ -8209,7 +8210,7 @@ private PhysicalPlan optimizedPlan(PhysicalPlan plan, SearchStats searchStats) {
         // individually hence why here the plan is kept as is
 
         var l = p.transformUp(FragmentExec.class, fragment -> {
-            var localPlan = PlannerUtils.localPlan(config, FoldContext.small(), fragment, searchStats);
+            var localPlan = PlannerUtils.localPlan(new EsqlFlags(true), config, FoldContext.small(), fragment, searchStats);
             return EstimatesRowSize.estimateRowSize(fragment.estimatedRowSize(), localPlan);
         });
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/TestPlannerOptimizer.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/TestPlannerOptimizer.java
@@ -15,6 +15,7 @@
 import org.elasticsearch.xpack.esql.plan.physical.PhysicalPlan;
 import org.elasticsearch.xpack.esql.planner.PlannerUtils;
 import org.elasticsearch.xpack.esql.planner.mapper.Mapper;
+import org.elasticsearch.xpack.esql.plugin.EsqlFlags;
 import org.elasticsearch.xpack.esql.session.Configuration;
 import org.elasticsearch.xpack.esql.stats.SearchStats;
 
@@ -63,10 +64,10 @@ private PhysicalPlan optimizedPlan(PhysicalPlan plan, SearchStats searchStats) {
         // individually hence why here the plan is kept as is
 
         var logicalTestOptimizer = new LocalLogicalPlanOptimizer(
-            new LocalLogicalOptimizerContext(config, FoldContext.small(), searchStats)
+            new LocalLogicalOptimizerContext( config, FoldContext.small(), searchStats)
         );
         var physicalTestOptimizer = new TestLocalPhysicalPlanOptimizer(
-            new LocalPhysicalOptimizerContext(config, FoldContext.small(), searchStats),
+            new LocalPhysicalOptimizerContext(new EsqlFlags(true), config, FoldContext.small(), searchStats),
             true
         );
         var l = PlannerUtils.localPlan(physicalPlan, logicalTestOptimizer, physicalTestOptimizer);
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/PushTopNToSourceTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/local/PushTopNToSourceTests.java
@@ -35,6 +35,7 @@
 import org.elasticsearch.xpack.esql.plan.physical.EvalExec;
 import org.elasticsearch.xpack.esql.plan.physical.PhysicalPlan;
 import org.elasticsearch.xpack.esql.plan.physical.TopNExec;
+import org.elasticsearch.xpack.esql.plugin.EsqlFlags;
 import org.elasticsearch.xpack.esql.stats.SearchStats;
 
 import java.io.IOException;
@@ -416,7 +417,7 @@ private static void assertNoPushdownSort(TestPhysicalPlanBuilder builder, String
 
     private static PhysicalPlan pushTopNToSource(TopNExec topNExec) {
         var configuration = EsqlTestUtils.configuration("from test");
-        var ctx = new LocalPhysicalOptimizerContext(configuration, FoldContext.small(), SearchStats.EMPTY);
+        var ctx = new LocalPhysicalOptimizerContext(new EsqlFlags(true), configuration, FoldContext.small(), SearchStats.EMPTY);
         var pushTopNToSource = new PushTopNToSource();
         return pushTopNToSource.rule(topNExec, ctx);
     }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/EvalMapperTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/EvalMapperTests.java
@@ -79,8 +79,7 @@ public class EvalMapperTests extends ESTestCase {
         false,
         Map.of(),
         System.nanoTime(),
-        false,
-        true
+        false
     );
 
     @ParametersFactory(argumentFormatting = "%1$s")
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlannerTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/planner/LocalExecutionPlannerTests.java
@@ -335,8 +335,7 @@ private Configuration config() {
             false,
             Map.of(),
             System.nanoTime(),
-            randomBoolean(),
-            true
+            randomBoolean()
         );
     }
 
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/ConfigurationSerializationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/ConfigurationSerializationTests.java
@@ -102,8 +102,7 @@ protected Configuration mutateInstance(Configuration in) {
             profile,
             tables,
             System.nanoTime(),
-            randomBoolean(),
-            true
+            randomBoolean()
         );
 
     }

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,7 @@ public static Configuration randomConfiguration(String query, Map<String, Map<St`
`72`	`72`	`profile,`
`73`	`73`	`tables,`
`74`	`74`	`System.nanoTime(),`
`75`		`- false,`
`76`		`- true // stringLikeOnIndex, default to true for tests`
	`75`	`+ false`
`77`	`76`	`);`
`78`	`77`	`}`
`79`	`78`
Original file line number	Diff line number	Diff line change
`@@ -429,8 +429,7 @@ public static Configuration configuration(QueryPragmas pragmas, String query) {`
`429`	`429`	`false,`
`430`	`430`	`TABLES,`
`431`	`431`	`System.nanoTime(),`
`432`		`- false,`
`433`		`- true // stringLikeOnIndex, default to true for tests`
	`432`	`+ false`
`434`	`433`	`);`
`435`	`434`	`}`
`436`	`435`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@ private static Configuration randomConfiguration() {`
`55`	`55`	`randomBoolean(),`
`56`	`56`	`Map.of(),`
`57`	`57`	`System.nanoTime(),`
`58`		`- randomBoolean(),`
`59`		`- true`
	`58`	`+ randomBoolean()`
`60`	`59`	`);`
`61`	`60`	`}`
`62`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ private Configuration randomLocaleConfig() {`
`71`	`71`	`false,`
`72`	`72`	`Map.of(),`
`73`	`73`	`System.nanoTime(),`
`74`		`- randomBoolean(),`
`75`		`- true`
	`74`	`+ randomBoolean()`
`76`	`75`	`);`
`77`	`76`	`}`
`78`	`77`