From b928e1c62e93f0f55d437aaf47d35ee6c72e589f Mon Sep 17 00:00:00 2001 From: Weihao Li <18110526956@163.com> Date: Thu, 11 Jun 2026 18:12:09 +0800 Subject: [PATCH 1/3] fix Signed-off-by: Weihao Li <18110526956@163.com> --- .../relational/planner/RelationPlanner.java | 25 +++++++++++-------- .../plan/planner/plan/node/PlanNodeType.java | 4 ++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java index bf09235c5c21c..6acc8ca55cce2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java @@ -343,17 +343,7 @@ private RelationPlan processPhysicalTable(Table table, Scope scope) { final ImmutableList.Builder outputSymbolsBuilder = ImmutableList.builder(); final ImmutableMap.Builder symbolToColumnSchema = ImmutableMap.builder(); final Collection fields = scope.getRelationType().getAllFields(); - final QualifiedName qualifiedName = analysis.getRelationName(table); - - if (!qualifiedName.getPrefix().isPresent()) { - throw new IllegalStateException( - DataNodeQueryMessages.TABLE + table.getName() + " has no prefix!"); - } - - final QualifiedObjectName qualifiedObjectName = - new QualifiedObjectName( - qualifiedName.getPrefix().map(QualifiedName::toString).orElse(null), - qualifiedName.getSuffix()); + final QualifiedObjectName qualifiedObjectName = getQualifiedObjectName(table, analysis); // on the basis of that the order of fields is same with the column category order of segments // in DeviceEntry @@ -411,6 +401,19 @@ private RelationPlan processPhysicalTable(Table table, Scope scope) { return new RelationPlan(tableScanNode, scope, outputSymbols, outerContext); } + public static QualifiedObjectName getQualifiedObjectName(Table table, Analysis analysis) { + final QualifiedName qualifiedName = analysis.getRelationName(table); + if (!qualifiedName.getPrefix().isPresent()) { + throw new IllegalStateException("Table " + table.getName() + " has no prefix!"); + } + + final QualifiedObjectName qualifiedObjectName = + new QualifiedObjectName( + qualifiedName.getPrefix().map(QualifiedName::toString).orElse(null), + qualifiedName.getSuffix()); + return qualifiedObjectName; + } + @Override public RelationPlan visitQuerySpecification(final QuerySpecification node, final Void context) { return new QueryPlanner( diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java index 76a3b2f5e280f..265aeef2097e6 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java @@ -200,7 +200,9 @@ public enum PlanNodeType { TABLE_DISK_USAGE_INFORMATION_SCHEMA_TABLE_SCAN_NODE((short) 1040), ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1041), NON_ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1042), - TABLE_NEXT_FILL_NODE((short) 1043), + EVENT_SCAN_NODE((short) 1043), + SESSION_SCAN_NODE((short) 1044), + TABLE_NEXT_FILL_NODE((short) 1045), RELATIONAL_INSERT_TABLET((short) 2000), RELATIONAL_INSERT_ROW((short) 2001), From 641f4e4e326a552e7fc979195b92bd8173f73a02 Mon Sep 17 00:00:00 2001 From: Weihao Li <18110526956@163.com> Date: Thu, 11 Jun 2026 18:57:35 +0800 Subject: [PATCH 2/3] fix Signed-off-by: Weihao Li <18110526956@163.com> --- .../queryengine/plan/planner/plan/node/PlanNodeType.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java index 265aeef2097e6..e2d51a0df8a1e 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java @@ -200,9 +200,9 @@ public enum PlanNodeType { TABLE_DISK_USAGE_INFORMATION_SCHEMA_TABLE_SCAN_NODE((short) 1040), ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1041), NON_ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1042), - EVENT_SCAN_NODE((short) 1043), - SESSION_SCAN_NODE((short) 1044), - TABLE_NEXT_FILL_NODE((short) 1045), + TABLE_NEXT_FILL_NODE((short) 1043), + EVENT_SCAN_NODE((short) 1044), + SESSION_SCAN_NODE((short) 1045), RELATIONAL_INSERT_TABLET((short) 2000), RELATIONAL_INSERT_ROW((short) 2001), From e25555c8867ac3bf837d5187b8cb0f184fcacf37 Mon Sep 17 00:00:00 2001 From: Weihao Li <18110526956@163.com> Date: Thu, 11 Jun 2026 19:01:51 +0800 Subject: [PATCH 3/3] fix Signed-off-by: Weihao Li <18110526956@163.com> --- .../queryengine/plan/planner/plan/node/PlanNodeType.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java index e2d51a0df8a1e..e36796fca43c3 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java @@ -201,8 +201,8 @@ public enum PlanNodeType { ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1041), NON_ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1042), TABLE_NEXT_FILL_NODE((short) 1043), - EVENT_SCAN_NODE((short) 1044), - SESSION_SCAN_NODE((short) 1045), + SESSION_SCAN_NODE((short) 1044), + EVENT_SCAN_NODE((short) 1045), RELATIONAL_INSERT_TABLET((short) 2000), RELATIONAL_INSERT_ROW((short) 2001),