fix bug

Author: shizy818

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java

@@ -250,18 +250,42 @@ protected RelationPlan visitTable(final Table table, final Void context) {
       if (namedQuery.isMaterialized()) {
         CteDataStore dataStore = queryContext.getCteDataStore(table);
         if (dataStore != null) {
-          List<Symbol> outputSymbols =
-              analysis.getOutputDescriptor(table).getAllFields().stream()
-                  .map(symbolAllocator::newSymbol)
-                  .collect(toImmutableList());
+          List<Symbol> cteSymbols = new ArrayList<>();
+          Map<String, Symbol> cteSymbolMap = new HashMap<>();
+          dataStore
+              .getTableSchema()
+              .getColumns()
+              .forEach(
+                  column -> {
+                    Symbol columnSymbol =
+                        symbolAllocator.newSymbol(column.getName(), column.getType());
+                    cteSymbols.add(columnSymbol);
+                    cteSymbolMap.put(column.getName(), columnSymbol);
+                  });
 
           // CTE Scan Node
-          return new RelationPlan(
-              new CteScanNode(
-                  idAllocator.genPlanNodeId(), table.getName(), outputSymbols, dataStore),
-              scope,
-              outputSymbols,
-              outerContext);
+          CteScanNode cteScanNode =
+              new CteScanNode(idAllocator.genPlanNodeId(), table.getName(), cteSymbols, dataStore);
+
+          List<Symbol> outputSymbols = new ArrayList<>();
+          Assignments.Builder assignments = Assignments.builder();
+          analysis
+              .getOutputDescriptor(table)
+              .getVisibleFields()
+              .forEach(
+                  field -> {
+                    String columnName = field.getName().orElse("field");
+                    Symbol symbol = cteSymbolMap.get(columnName);
+                    outputSymbols.add(symbol);
+                    assignments.put(symbol, symbol.toSymbolReference());
+                  });
+
+          // Project Node
+          ProjectNode projectNode =
+              new ProjectNode(
+                  queryContext.getQueryId().genPlanNodeId(), cteScanNode, assignments.build());
+
+          return new RelationPlan(projectNode, scope, outputSymbols, outerContext);
         }
       }
 

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/ir/CteMaterializer.java

@@ -50,6 +50,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public class CteMaterializer {
 
@@ -143,17 +145,33 @@ public static CteDataStore fetchCteQueryResult(
   }
 
   private static TableSchema getTableSchema(DatasetHeader datasetHeader, String cteName) {
-    List<String> columnNames = datasetHeader.getRespColumns();
-    List<TSDataType> columnDataTypes = datasetHeader.getRespDataTypes();
-    final List<ColumnSchema> columnSchemaList = new ArrayList<>();
-    for (int i = 0; i < columnNames.size(); i++) {
-      columnSchemaList.add(
-          new ColumnSchema(
-              columnNames.get(i),
-              TypeFactory.getType(columnDataTypes.get(i)),
-              false,
-              TsTableColumnCategory.FIELD));
+    final List<String> columnNames = datasetHeader.getRespColumns();
+    final List<TSDataType> columnDataTypes = datasetHeader.getRespDataTypes();
+    if (columnNames.size() != columnDataTypes.size()) {
+      throw new IoTDBRuntimeException(
+          "Size of column names and column data types do not match",
+          TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
     }
+    final Map<String, Integer> columnNameIndexMap = datasetHeader.getColumnNameIndexMap();
+    final List<ColumnSchema> columnSchemaList = new ArrayList<>();
+
+    // build name -> type map
+    Map<String, TSDataType> columnNameDataTypeMap =
+        IntStream.range(0, columnNames.size())
+            .boxed()
+            .collect(Collectors.toMap(columnNames::get, columnDataTypes::get));
+
+    // build column schema list of cte table based on columnNameIndexMap
+    columnNameIndexMap.entrySet().stream()
+        .sorted(Map.Entry.comparingByValue())
+        .forEach(
+            entry ->
+                columnSchemaList.add(
+                    new ColumnSchema(
+                        entry.getKey(),
+                        TypeFactory.getType(columnNameDataTypeMap.get(entry.getKey())),
+                        false,
+                        TsTableColumnCategory.FIELD)));
     return new TableSchema(cteName, columnSchemaList);
   }
 }