More nocommit

nik9000 · Jul 10, 2024 · 0eb2958 · 0eb2958
1 parent 547e5a5
commit 0eb2958
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Analyzer.java
@@ -65,7 +65,6 @@
 import org.elasticsearch.xpack.esql.plan.logical.Enrich;
 import org.elasticsearch.xpack.esql.plan.logical.EsRelation;
 import org.elasticsearch.xpack.esql.plan.logical.Eval;
-import org.elasticsearch.xpack.esql.plan.logical.InlineStats;
 import org.elasticsearch.xpack.esql.plan.logical.Keep;
 import org.elasticsearch.xpack.esql.plan.logical.Limit;
 import org.elasticsearch.xpack.esql.plan.logical.LogicalPlan;
@@ -1092,6 +1091,7 @@ protected LogicalPlan doRule(LogicalPlan plan) {
             // In ResolveRefs the aggregates are resolved from the groupings, which might have an unresolved MultiTypeEsField.
             // Now that we have resolved those, we need to re-resolve the aggregates.
             if (plan instanceof Aggregate agg) {
+                // NOCOMMIT something for inlinestats
                 // If the union-types resolution occurred in a child of the aggregate, we need to check the groupings
                 plan = agg.transformExpressionsOnly(FieldAttribute.class, UnresolveUnionTypes::checkUnresolved);
 

diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/Mapper.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/planner/Mapper.java
@@ -265,9 +265,9 @@ private PhysicalPlan addExchangeForFragment(LogicalPlan logical, PhysicalPlan ch
 
     private PhysicalPlan map(BinaryPlan p, PhysicalPlan lhs, PhysicalPlan rhs) {
         if (p instanceof Join join) {
-            PhysicalPlan mapped = tryHashJoin(join, lhs, rhs);
-            if (mapped != null) {
-                return mapped;
+            PhysicalPlan hash = tryHashJoin(join, lhs, rhs);
+            if (hash != null) {
+                return hash;
             }
         }
         throw new EsqlIllegalArgumentException("unsupported logical plan node [" + p.nodeName() + "]");