remove unnecessary changes to FieldNameUtils

Author: not-napoleon

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

@@ -786,17 +786,11 @@ public record PreAnalysisResult(
         EnrichResolution enrichResolution,
         Set<String> fieldNames,
         Set<String> wildcardJoinIndices,
-        InferenceResolution inferenceResolution,
-        boolean collectAllDimensions
+        InferenceResolution inferenceResolution
     ) {
 
-        public PreAnalysisResult(
-            EnrichResolution enrichResolution,
-            Set<String> fieldNames,
-            Set<String> wildcardJoinIndices,
-            boolean collectAllDimensions
-        ) {
-            this(null, new HashMap<>(), enrichResolution, fieldNames, wildcardJoinIndices, InferenceResolution.EMPTY, collectAllDimensions);
+        public PreAnalysisResult(EnrichResolution enrichResolution, Set<String> fieldNames, Set<String> wildcardJoinIndices) {
+            this(null, new HashMap<>(), enrichResolution, fieldNames, wildcardJoinIndices, InferenceResolution.EMPTY);
         }
 
         PreAnalysisResult withInferenceResolution(InferenceResolution newInferenceResolution) {
@@ -806,8 +800,7 @@ PreAnalysisResult withInferenceResolution(InferenceResolution newInferenceResolu
                 enrichResolution(),
                 fieldNames(),
                 wildcardJoinIndices(),
-                newInferenceResolution,
-                collectAllDimensions()
+                newInferenceResolution
             );
         }
 
@@ -818,8 +811,7 @@ PreAnalysisResult withIndexResolution(IndexResolution newIndexResolution) {
                 enrichResolution(),
                 fieldNames(),
                 wildcardJoinIndices(),
-                inferenceResolution(),
-                collectAllDimensions()
+                inferenceResolution()
             );
         }
 

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

@@ -70,19 +70,10 @@ public static PreAnalysisResult resolveFieldNames(LogicalPlan parsed, EnrichReso
             inlinestatsAggs.add(((InlineStats) i).aggregate());
         }
 
-        boolean shouldCollectAllDimensions = false;
-        // Detect if we are in TS mode
-        List<LogicalPlan> relations = parsed.collect(UnresolvedRelation.class::isInstance);
-        for (LogicalPlan i : relations) {
-            if (((UnresolvedRelation) i).isTimeSeriesMode()) {
-                shouldCollectAllDimensions = true;
-            }
-        }
-
         if (false == parsed.anyMatch(p -> shouldCollectReferencedFields(p, inlinestatsAggs))) {
             // no explicit columns selection, for example "from employees"
             // also, inlinestats only adds columns to the existent output, its Aggregate shouldn't interfere with potentially using "*"
-            return new PreAnalysisResult(enrichResolution, IndexResolver.ALL_FIELDS, Set.of(), shouldCollectAllDimensions);
+            return new PreAnalysisResult(enrichResolution, IndexResolver.ALL_FIELDS, Set.of());
         }
 
         Holder<Boolean> projectAll = new Holder<>(false);
@@ -94,7 +85,7 @@ public static PreAnalysisResult resolveFieldNames(LogicalPlan parsed, EnrichReso
         });
 
         if (projectAll.get()) {
-            return new PreAnalysisResult(enrichResolution, IndexResolver.ALL_FIELDS, Set.of(), shouldCollectAllDimensions);
+            return new PreAnalysisResult(enrichResolution, IndexResolver.ALL_FIELDS, Set.of());
         }
 
         var referencesBuilder = new Holder<>(AttributeSet.builder());
@@ -229,7 +220,7 @@ public static PreAnalysisResult resolveFieldNames(LogicalPlan parsed, EnrichReso
         parsed.forEachDownMayReturnEarly(forEachDownProcessor.get());
 
         if (projectAll.get()) {
-            return new PreAnalysisResult(enrichResolution, IndexResolver.ALL_FIELDS, Set.of(), shouldCollectAllDimensions);
+            return new PreAnalysisResult(enrichResolution, IndexResolver.ALL_FIELDS, Set.of());
         }
 
         // Add JOIN ON column references afterward to avoid Alias removal
@@ -243,17 +234,12 @@ public static PreAnalysisResult resolveFieldNames(LogicalPlan parsed, EnrichReso
 
         if (fieldNames.isEmpty() && enrichPolicyMatchFields.isEmpty()) {
             // there cannot be an empty list of fields, we'll ask the simplest and lightest one instead: _index
-            return new PreAnalysisResult(
-                enrichResolution,
-                IndexResolver.INDEX_METADATA_FIELD,
-                wildcardJoinIndices,
-                shouldCollectAllDimensions
-            );
+            return new PreAnalysisResult(enrichResolution, IndexResolver.INDEX_METADATA_FIELD, wildcardJoinIndices);
         } else {
             fieldNames.addAll(subfields(fieldNames));
             fieldNames.addAll(enrichPolicyMatchFields);
             fieldNames.addAll(subfields(enrichPolicyMatchFields));
-            return new PreAnalysisResult(enrichResolution, fieldNames, wildcardJoinIndices, shouldCollectAllDimensions);
+            return new PreAnalysisResult(enrichResolution, fieldNames, wildcardJoinIndices);
         }
     }
 

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

@@ -17,7 +17,6 @@
 import org.elasticsearch.xpack.esql.parser.ParsingException;
 import org.elasticsearch.xpack.esql.plan.logical.Enrich;
 
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1613,7 +1612,7 @@ public void testMetrics() {
             assertThat(e.getMessage(), containsString("line 1:1: mismatched input 'TS' expecting {"));
             return;
         }
-        assertTsFieldNames(
+        assertFieldNames(
             query,
             Set.of(
                 "@timestamp",
@@ -2996,27 +2995,9 @@ private void assertFieldNames(String query, Set<String> expected, Set<String> wi
     }
 
     private void assertFieldNames(String query, EnrichResolution enrichResolution, Set<String> expected, Set<String> wildCardIndices) {
-        EsqlSession.PreAnalysisResult preAnalysisResult = FieldNameUtils.resolveFieldNames(
-            parser.createStatement(query, EsqlTestUtils.TEST_CFG),
-            enrichResolution
-        );
+        var preAnalysisResult = FieldNameUtils.resolveFieldNames(parser.createStatement(query, EsqlTestUtils.TEST_CFG), enrichResolution);
         assertThat("Query-wide field names", preAnalysisResult.fieldNames(), equalTo(expected));
         assertThat("Lookup Indices that expect wildcard lookups", preAnalysisResult.wildcardJoinIndices(), equalTo(wildCardIndices));
-        assertThat(preAnalysisResult.collectAllDimensions(), equalTo(false));
-    }
-
-    private void assertTsFieldNames(String query, Set<String> expected) {
-        // Expected may be unmodifiable
-        Set<String> tsExpected = new HashSet<>(expected);
-        tsExpected.add("@timestamp");
-        tsExpected.add("@timestamp.*");
-
-        EsqlSession.PreAnalysisResult preAnalysisResult = FieldNameUtils.resolveFieldNames(
-            parser.createStatement(query, EsqlTestUtils.TEST_CFG),
-            new EnrichResolution()
-        );
-        assertThat("Query-wide field names", preAnalysisResult.fieldNames(), equalTo(tsExpected));
-        assertThat("TS mode query should collect all dimensions", preAnalysisResult.collectAllDimensions(), equalTo(true));
     }
 
     private static EnrichResolution enrichResolutionWith(String enrichPolicyMatchField) {