Fixed PhysicalOptimizerTests not using same config for everything

Author: ivancea

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/Configuration.java

@@ -224,6 +224,10 @@ public boolean profile() {
         return profile;
     }
 
+    public Set<String> activeEsqlFeatures() {
+        return activeEsqlFeatures;
+    }
+
     public boolean clusterHasFeature(NodeFeature feature) {
         return activeEsqlFeatures.contains(feature.id());
     }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java

@@ -217,7 +217,7 @@ public PhysicalPlanOptimizerTests(String name, Configuration config) {
     @Before
     public void init() {
         parser = new EsqlParser();
-        logicalOptimizer = new LogicalPlanOptimizer(new LogicalOptimizerContext(EsqlTestUtils.TEST_CFG));
+        logicalOptimizer = new LogicalPlanOptimizer(new LogicalOptimizerContext(config));
         physicalPlanOptimizer = new PhysicalPlanOptimizer(new PhysicalOptimizerContext(config));
         EsqlFunctionRegistry functionRegistry = new EsqlFunctionRegistry();
         mapper = new Mapper();
@@ -6588,7 +6588,7 @@ private PhysicalPlan physicalPlan(String query, TestDataSource dataSource) {
         // System.out.println("Logical\n" + logical);
         var physical = mapper.map(logical);
         // System.out.println(physical);
-        assertSerialization(physical);
+        assertSerialization(physical, config);
         return physical;
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/AbstractNodeSerializationTests.java

@@ -35,7 +35,7 @@ public abstract class AbstractNodeSerializationTests<T extends Node<? super T>>
      * We use a single random config for all serialization because it's pretty
      * heavy to build, especially in {@link #testConcurrentSerialization()}.
      */
-    private Configuration config;
+    private static Configuration config;
 
     public static Source randomSource() {
         int lineNumber = between(0, EXAMPLE_QUERY.length - 1);
@@ -77,7 +77,7 @@ protected boolean alwaysEmptySource() {
         return false;
     }
 
-    public final Configuration configuration() {
+    public static final Configuration configuration() {
         return config;
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/AggregateSerializationTests.java

@@ -52,7 +52,7 @@ public static List<? extends NamedExpression> randomAggregates() {
                     new Literal(randomSource(), randomFrom("ASC", "DESC"), DataType.KEYWORD)
                 );
                 case 4 -> new Values(randomSource(), FieldAttributeTests.createFieldAttribute(1, true));
-                case 5 -> new Sum(randomSource(), FieldAttributeTests.createFieldAttribute(1, true), EsqlTestUtils.TEST_CFG);
+                case 5 -> new Sum(randomSource(), FieldAttributeTests.createFieldAttribute(1, true), configuration());
                 default -> throw new IllegalArgumentException();
             };
             result.add(new Alias(randomSource(), randomAlphaOfLength(5), agg));

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plugin/DataNodeRequestTests.java

@@ -11,6 +11,7 @@
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.features.NodeFeature;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.IndexMode;
 import org.elasticsearch.index.query.TermQueryBuilder;
@@ -33,15 +34,16 @@
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
 import org.elasticsearch.xpack.esql.plan.physical.PhysicalPlan;
 import org.elasticsearch.xpack.esql.planner.mapper.Mapper;
+import org.elasticsearch.xpack.esql.session.Configuration;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import static org.elasticsearch.xpack.esql.ConfigurationTestUtils.randomConfiguration;
 import static org.elasticsearch.xpack.esql.ConfigurationTestUtils.randomTables;
-import static org.elasticsearch.xpack.esql.EsqlTestUtils.TEST_CFG;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.TEST_VERIFIER;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.emptyPolicyResolution;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.loadMapping;
@@ -79,14 +81,15 @@ protected DataNodeRequest createTestInstance() {
             | stats x = avg(salary)
             """);
         List<ShardId> shardIds = randomList(1, 10, () -> new ShardId("index-" + between(1, 10), "n/a", between(1, 10)));
-        PhysicalPlan physicalPlan = mapAndMaybeOptimize(parse(query));
+        Configuration configuration = randomLimitedConfiguration(query);
+        PhysicalPlan physicalPlan = mapAndMaybeOptimize(parse(query, configuration), configuration);
         Map<Index, AliasFilter> aliasFilters = Map.of(
             new Index("concrete-index", "n/a"),
             AliasFilter.of(new TermQueryBuilder("id", "1"), "alias-1")
         );
         DataNodeRequest request = new DataNodeRequest(
             sessionId,
-            randomConfiguration(query, randomTables()),
+            configuration,
             randomAlphaOfLength(10),
             shardIds,
             aliasFilters,
@@ -164,7 +167,7 @@ protected DataNodeRequest mutateInstance(DataNodeRequest in) throws IOException
                     in.clusterAlias(),
                     in.shardIds(),
                     in.aliasFilters(),
-                    mapAndMaybeOptimize(parse(newQuery)),
+                    mapAndMaybeOptimize(parse(newQuery, in.configuration()), in.configuration()),
                     in.indices(),
                     in.indicesOptions()
                 );
@@ -260,20 +263,20 @@ protected DataNodeRequest mutateInstance(DataNodeRequest in) throws IOException
         };
     }
 
-    static LogicalPlan parse(String query) {
+    static LogicalPlan parse(String query, Configuration configuration) {
         Map<String, EsField> mapping = loadMapping("mapping-basic.json");
         EsIndex test = new EsIndex("test", mapping, Map.of("test", IndexMode.STANDARD));
         IndexResolution getIndexResult = IndexResolution.valid(test);
-        var logicalOptimizer = new LogicalPlanOptimizer(new LogicalOptimizerContext(TEST_CFG));
+        var logicalOptimizer = new LogicalPlanOptimizer(new LogicalOptimizerContext(configuration));
         var analyzer = new Analyzer(
-            new AnalyzerContext(EsqlTestUtils.TEST_CFG, new EsqlFunctionRegistry(), getIndexResult, emptyPolicyResolution()),
+            new AnalyzerContext(configuration, new EsqlFunctionRegistry(), getIndexResult, emptyPolicyResolution()),
             TEST_VERIFIER
         );
         return logicalOptimizer.optimize(analyzer.analyze(new EsqlParser().createStatement(query)));
     }
 
-    static PhysicalPlan mapAndMaybeOptimize(LogicalPlan logicalPlan) {
-        var physicalPlanOptimizer = new PhysicalPlanOptimizer(new PhysicalOptimizerContext(TEST_CFG));
+    static PhysicalPlan mapAndMaybeOptimize(LogicalPlan logicalPlan, Configuration configuration) {
+        var physicalPlanOptimizer = new PhysicalPlanOptimizer(new PhysicalOptimizerContext(configuration));
         var mapper = new Mapper();
         var physical = mapper.map(logicalPlan);
         if (randomBoolean()) {
@@ -286,4 +289,29 @@ static PhysicalPlan mapAndMaybeOptimize(LogicalPlan logicalPlan) {
     protected List<String> filteredWarnings() {
         return withDefaultLimitWarning(super.filteredWarnings());
     }
+
+    /**
+     * Builds a configuration with a fixed limit of 10000 rows and 1000 bytes.
+     * <p>
+     *     Without this, warnings would be randomized, and hard to filter from the warnings.
+     * </p>
+     */
+    private Configuration randomLimitedConfiguration(String query) {
+        Configuration configuration = randomConfiguration(query, randomTables());
+
+        return new Configuration(
+            configuration.zoneId(),
+            configuration.locale(),
+            configuration.username(),
+            configuration.clusterName(),
+            configuration.pragmas(),
+            10000,
+            1000,
+            configuration.query(),
+            configuration.profile(),
+            configuration.tables(),
+            configuration.getQueryStartTimeNanos(),
+            configuration.activeEsqlFeatures()
+        );
+    }
 }