(iotdb) branch ty/TableModelGrammar updated: Delete SchemaQueryMergeNode in LogicalPlanner

[jackietien]

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a commit to branch ty/TableModelGrammar
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/ty/TableModelGrammar by this 
push:
     new 8db2c3dbc9e Delete SchemaQueryMergeNode in LogicalPlanner
8db2c3dbc9e is described below

commit 8db2c3dbc9e4c677666373b9ba89e0384ba28ae2
Author: Jackie Tien <jackietie...@gmail.com>
AuthorDate: Wed Jul 10 16:05:33 2024 +0800

    Delete SchemaQueryMergeNode in LogicalPlanner
---
 .../db/queryengine/plan/relational/planner/LogicalPlanner.java   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LogicalPlanner.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LogicalPlanner.java
index ac17c3ff500..373af20e2fb 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LogicalPlanner.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/LogicalPlanner.java
@@ -25,7 +25,6 @@ import 
org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector;
 import org.apache.iotdb.db.queryengine.plan.analyze.QueryType;
 import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan;
 import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
-import 
org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.read.SchemaQueryMergeNode;
 import 
org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.read.TableDeviceFetchNode;
 import 
org.apache.iotdb.db.queryengine.plan.planner.plan.node.metedata.read.TableDeviceQueryNode;
 import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
@@ -210,7 +209,6 @@ public class LogicalPlanner {
 
     analysis.setRespDatasetHeader(new DatasetHeader(columnHeaderList, true));
 
-    SchemaQueryMergeNode mergeNode = new 
SchemaQueryMergeNode(context.getQueryId().genPlanNodeId());
     TableDeviceFetchNode fetchNode =
         new TableDeviceFetchNode(
             context.getQueryId().genPlanNodeId(),
@@ -219,7 +217,6 @@ public class LogicalPlanner {
             statement.getDeviceIdList(),
             columnHeaderList,
             null);
-    mergeNode.addChild(fetchNode);
 
     SchemaPartition schemaPartition =
         metadata.getSchemaPartition(statement.getDatabase(), 
statement.getPartitionKeyList());
@@ -229,7 +226,7 @@ public class LogicalPlanner {
       analysis.setFinishQueryAfterAnalyze();
     }
 
-    return mergeNode;
+    return fetchNode;
   }
 
   private PlanNode planShowDevice(ShowDevice statement, Analysis analysis) {
@@ -238,7 +235,6 @@ public class LogicalPlanner {
     List<ColumnHeader> columnHeaderList =
         getColumnHeaderList(statement.getDatabase(), statement.getTableName());
 
-    SchemaQueryMergeNode mergeNode = new 
SchemaQueryMergeNode(context.getQueryId().genPlanNodeId());
     TableDeviceQueryNode queryNode =
         new TableDeviceQueryNode(
             context.getQueryId().genPlanNodeId(),
@@ -248,7 +244,6 @@ public class LogicalPlanner {
             statement.getIdFuzzyPredicate(),
             columnHeaderList,
             null);
-    mergeNode.addChild(queryNode);
 
     SchemaPartition schemaPartition =
         statement.isIdDetermined()
@@ -260,7 +255,7 @@ public class LogicalPlanner {
       analysis.setFinishQueryAfterAnalyze();
     }
 
-    return mergeNode;
+    return queryNode;
   }
 
   private List<ColumnHeader> getColumnHeaderList(String database, String 
tableName) {