Integrate with latest from main and fix merge errors

Author: julian-elastic

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/physical/ProjectAwayColumns.java

@@ -24,7 +24,6 @@
 import org.elasticsearch.xpack.esql.rule.Rule;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 
 import static java.lang.Boolean.FALSE;
@@ -46,7 +45,7 @@ public PhysicalPlan apply(PhysicalPlan plan) {
         // and the overall output will not change.
         AttributeSet.Builder requiredAttrBuilder = plan.outputSet().asBuilder();
 
-        PhysicalPlan planAfter = plan.transformDown(currentPlanNode -> {
+        return plan.transformDown(currentPlanNode -> {
             if (keepTraversing.get() == false) {
                 return currentPlanNode;
             }
@@ -102,7 +101,6 @@ public PhysicalPlan apply(PhysicalPlan plan) {
                             output = Expressions.asAttributes(fields);
                         }
                         // add a logical projection (let the local replanning remove it if needed)
-                        output = reorderOutput(logicalFragment.output(), output);
                         FragmentExec newChild = new FragmentExec(
                             Source.EMPTY,
                             new Project(logicalFragment.source(), logicalFragment, output),
@@ -120,27 +118,5 @@ public PhysicalPlan apply(PhysicalPlan plan) {
             }
             return currentPlanNode;
         });
-        return planAfter;
-    }
-
-    private List<Attribute> reorderOutput(List<Attribute> expectedOrder, List<Attribute> attributesToSort) {
-        List<Attribute> output = new ArrayList<>(attributesToSort.size());
-        // Track which attributes have been added
-        var added = new HashSet<Attribute>();
-
-        // Add attributes in expectedOrder if present in attributesToSort
-        for (Attribute expected : expectedOrder) {
-            if (attributesToSort.contains(expected)) {
-                output.add(expected);
-                added.add(expected);
-            }
-        }
-        // Add remaining attributes from attributesToSort in their original order
-        for (Attribute attr : attributesToSort) {
-            if (added.contains(attr) == false) {
-                output.add(attr);
-            }
-        }
-        return output;
     }
 }

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

@@ -2905,7 +2905,7 @@ public void testPruneRedundantSortClausesUsingAlias() {
     public void testInsist_fieldDoesNotExist_createsUnmappedFieldInRelation() {
         assumeTrue("Requires UNMAPPED FIELDS", EsqlCapabilities.Cap.UNMAPPED_FIELDS.isEnabled());
 
-        LogicalPlan plan = optimizedPlan("FROM test | INSIST_� foo");
+        LogicalPlan plan = optimizedPlan("FROM test | INSIST_\uD83D\uDC14 foo");
 
         var project = as(plan, Project.class);
         var limit = as(project.child(), Limit.class);
@@ -2916,7 +2916,7 @@ public void testInsist_fieldDoesNotExist_createsUnmappedFieldInRelation() {
     public void testInsist_multiIndexFieldPartiallyExistsAndIsKeyword_castsAreNotSupported() {
         assumeTrue("Requires UNMAPPED FIELDS", EsqlCapabilities.Cap.UNMAPPED_FIELDS.isEnabled());
 
-        var plan = planMultiIndex("FROM multi_index | INSIST_� partial_type_keyword");
+        var plan = planMultiIndex("FROM multi_index | INSIST_\uD83D\uDC14 partial_type_keyword");
         var project = as(plan, Project.class);
         var limit = as(project.child(), Limit.class);
         var relation = as(limit.child(), EsRelation.class);
@@ -2927,7 +2927,7 @@ public void testInsist_multiIndexFieldPartiallyExistsAndIsKeyword_castsAreNotSup
     public void testInsist_multipleInsistClauses_insistsAreFolded() {
         assumeTrue("Requires UNMAPPED FIELDS", EsqlCapabilities.Cap.UNMAPPED_FIELDS.isEnabled());
 
-        var plan = planMultiIndex("FROM multi_index | INSIST_� partial_type_keyword | INSIST_� foo");
+        var plan = planMultiIndex("FROM multi_index | INSIST_\uD83D\uDC14 partial_type_keyword | INSIST_\uD83D\uDC14 foo");
         var project = as(plan, Project.class);
         var limit = as(project.child(), Limit.class);
         var relation = as(limit.child(), EsRelation.class);