Make it type+plan

Author: luigidellaquila

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/Explain.java

@@ -10,10 +10,8 @@
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.xpack.esql.capabilities.TelemetryAware;
 import org.elasticsearch.xpack.esql.core.expression.Attribute;
-import org.elasticsearch.xpack.esql.core.expression.ReferenceAttribute;
 import org.elasticsearch.xpack.esql.core.tree.NodeInfo;
 import org.elasticsearch.xpack.esql.core.tree.Source;
-import org.elasticsearch.xpack.esql.core.type.DataType;
 
 import java.util.List;
 import java.util.Objects;
@@ -42,36 +40,13 @@ public String getWriteableName() {
         throw new UnsupportedOperationException("not serialized");
     }
 
-    // TODO: implement again
-    // @Override
-    // public void execute(EsqlSession session, ActionListener<Result> listener) {
-    // ActionListener<String> analyzedStringListener = listener.map(
-    // analyzed -> new Result(
-    // output(),
-    // List.of(List.of(query.toString(), Type.PARSED.toString()), List.of(analyzed, Type.ANALYZED.toString()))
-    // )
-    // );
-    //
-    // session.analyzedPlan(
-    // query,
-    // ActionListener.wrap(
-    // analyzed -> analyzedStringListener.onResponse(analyzed.toString()),
-    // e -> analyzedStringListener.onResponse(e.toString())
-    // )
-    // );
-    //
-    // }
-
     public LogicalPlan query() {
         return query;
     }
 
     @Override
     public List<Attribute> output() {
-        return List.of(
-            new ReferenceAttribute(Source.EMPTY, "plan", DataType.KEYWORD),
-            new ReferenceAttribute(Source.EMPTY, "type", DataType.KEYWORD)
-        );
+        throw new UnsupportedOperationException();
     }
 
     @Override

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

@@ -238,12 +238,15 @@ public void executeOptimizedPlan(
         if (explainMode) {
             String physicalPlanString = physicalPlan.toString();
             List<Attribute> fields = List.of(
-                new ReferenceAttribute(EMPTY, "parsedPlan", DataType.KEYWORD),
-                new ReferenceAttribute(EMPTY, "optimizedLogicalPlan", DataType.KEYWORD),
-                new ReferenceAttribute(EMPTY, "optimizedPhysicalPlan", DataType.KEYWORD)
+                new ReferenceAttribute(EMPTY, "role", DataType.KEYWORD),
+                new ReferenceAttribute(EMPTY, "type", DataType.KEYWORD),
+                new ReferenceAttribute(EMPTY, "plan", DataType.KEYWORD)
             );
-            List<Object> values = List.of(parsedPlanString, optimizedLogicalPlanString, physicalPlanString);
-            var blocks = BlockUtils.fromListRow(PlannerUtils.NON_BREAKING_BLOCK_FACTORY, values);
+            List<List<Object>> values = new ArrayList<>();
+            values.add(List.of("coordinator", "parsedPlan", parsedPlanString));
+            values.add(List.of("coordinator", "optimizedLogicalPlan", optimizedLogicalPlanString));
+            values.add(List.of("coordinator", "optimizedPhysicalPlan", physicalPlanString));
+            var blocks = BlockUtils.fromList(PlannerUtils.NON_BREAKING_BLOCK_FACTORY, values);
             physicalPlan = new LocalSourceExec(Source.EMPTY, fields, LocalSupplier.of(blocks));
         }
         // TODO: this could be snuck into the underlying listener

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/220_explain.yml

@@ -47,13 +47,19 @@ explainRow:
           query: 'EXPLAIN (row a = 1)'
 
   - length: { columns: 3 }
-  - length: { values: 1 }
-  - match: {columns.0.name: "parsedPlan"}
+  - match: {columns.0.name: "role"}
   - match: {columns.0.type: "keyword"}
-  - match: {columns.1.name: "optimizedLogicalPlan"}
+  - match: {columns.1.name: "type"}
   - match: {columns.1.type: "keyword"}
-  - match: {columns.2.name: "optimizedPhysicalPlan"}
+  - match: {columns.2.name: "plan"}
   - match: {columns.2.type: "keyword"}
+  - length: { values: 3 }
+  - match: { values.0.0: "coordinator" }
+  - match: { values.0.1: "parsedPlan" }
+  - match: { values.1.0: "coordinator" }
+  - match: { values.1.1: "optimizedLogicalPlan" }
+  - match: { values.2.0: "coordinator" }
+  - match: { values.2.1: "optimizedPhysicalPlan" }
 
 
 ---
@@ -66,13 +72,19 @@ explainQuery:
           query: 'EXPLAIN (from test | where color == "red" | eval b = 20)'
 
   - length: { columns: 3 }
-  - length: { values: 1 }
-  - match: {columns.0.name: "parsedPlan"}
+  - match: {columns.0.name: "role"}
   - match: {columns.0.type: "keyword"}
-  - match: {columns.1.name: "optimizedLogicalPlan"}
+  - match: {columns.1.name: "type"}
   - match: {columns.1.type: "keyword"}
-  - match: {columns.2.name: "optimizedPhysicalPlan"}
+  - match: {columns.2.name: "plan"}
   - match: {columns.2.type: "keyword"}
+  - length: { values: 3 }
+  - match: { values.0.0: "coordinator" }
+  - match: { values.0.1: "parsedPlan" }
+  - match: { values.1.0: "coordinator" }
+  - match: { values.1.1: "optimizedLogicalPlan" }
+  - match: { values.2.0: "coordinator" }
+  - match: { values.2.1: "optimizedPhysicalPlan" }
 
 
 ---