Refactor SQL analyzer and analyzer rules (elastic#97836)

Author: luigidellaquila

x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/analyzer/AnalyzerRules.java

@@ -145,7 +145,8 @@ public static List<Attribute> maybeResolveAgainstList(
         UnresolvedAttribute u,
         Collection<Attribute> attrList,
         boolean allowCompound,
-        boolean acceptPattern
+        boolean acceptPattern,
+        BiFunction<UnresolvedAttribute, Attribute, Attribute> specialFieldHandler
     ) {
         List<Attribute> matches = new ArrayList<>();
 
@@ -177,7 +178,7 @@ public static List<Attribute> maybeResolveAgainstList(
         // found exact match or multiple if pattern
         if (matches.size() == 1 || isPattern) {
             // only add the location if the match is univocal; b/c otherwise adding the location will overwrite any preexisting one
-            matches.replaceAll(e -> handleSpecialFields(u, e.withLocation(u.source()), allowCompound));
+            matches.replaceAll(e -> specialFieldHandler.apply(u, e.withLocation(u.source())));
             return matches;
         }
 
@@ -203,7 +204,7 @@ public static List<Attribute> maybeResolveAgainstList(
         );
     }
 
-    private static Attribute handleSpecialFields(UnresolvedAttribute u, Attribute named, boolean allowCompound) {
+    public static Attribute handleSpecialFields(UnresolvedAttribute u, Attribute named, boolean allowCompound) {
         // if it's a object/compound type, keep it unresolved with a nice error message
         if (named instanceof FieldAttribute fa) {
 

x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/plan/logical/EsRelation.java

@@ -27,9 +27,17 @@ public class EsRelation extends LeafPlan {
     private final boolean frozen;
 
     public EsRelation(Source source, EsIndex index, boolean frozen) {
+        this(source, index, flatten(source, index.mapping()), frozen);
+    }
+
+    public EsRelation(Source source, EsIndex index, List<Attribute> attributes) {
+        this(source, index, attributes, false);
+    }
+
+    private EsRelation(Source source, EsIndex index, List<Attribute> attributes, boolean frozen) {
         super(source);
         this.index = index;
-        this.attrs = flatten(source, index.mapping());
+        this.attrs = attributes;
         this.frozen = frozen;
     }
 

x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/plan/logical/Project.java

@@ -43,6 +43,10 @@ public List<? extends NamedExpression> projections() {
         return projections;
     }
 
+    public Project withProjections(List<? extends NamedExpression> projections) {
+        return new Project(source(), child(), projections);
+    }
+
     @Override
     public boolean resolved() {
         return super.resolved() && Expressions.anyMatch(projections, Functions::isAggregate) == false;

x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/type/EsField.java

@@ -48,13 +48,6 @@ public DataType getDataType() {
         return esDataType;
     }
 
-    /**
-     * Create a new {@link EsField} replacing the type.
-     */
-    public EsField withType(DataType esDataType) {
-        return new EsField(name, esDataType, properties, aggregatable, isAlias);
-    }
-
     /**
      * This field can be aggregated
      */

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/analysis/analyzer/Analyzer.java

@@ -8,6 +8,7 @@
 
 import org.elasticsearch.common.logging.LoggerMessageFormat;
 import org.elasticsearch.core.Tuple;
+import org.elasticsearch.xpack.ql.analyzer.AnalyzerRules;
 import org.elasticsearch.xpack.ql.analyzer.AnalyzerRules.AddMissingEqualsToBoolField;
 import org.elasticsearch.xpack.ql.analyzer.AnalyzerRules.ParameterizedAnalyzerRule;
 import org.elasticsearch.xpack.ql.capabilities.Resolvables;
@@ -166,7 +167,13 @@ private static Attribute resolveAgainstList(UnresolvedAttribute u, Collection<At
     }
 
     private static Attribute resolveAgainstList(UnresolvedAttribute u, Collection<Attribute> attrList, boolean allowCompound) {
-        var matches = maybeResolveAgainstList(u, attrList, allowCompound, false);
+        var matches = maybeResolveAgainstList(
+            u,
+            attrList,
+            allowCompound,
+            false,
+            (ua, na) -> AnalyzerRules.handleSpecialFields(ua, na, allowCompound)
+        );
         return matches.isEmpty() ? null : matches.get(0);
     }