You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2024/12/06 06:22:48 UTC
(iotdb) branch master updated: Support show-queries and kill-query
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 16f71c8b632 Support show-queries and kill-query
16f71c8b632 is described below
commit 16f71c8b632727de3eaa1aa5b354aff7412b72e4
Author: Weihao Li <60...@users.noreply.github.com>
AuthorDate: Fri Dec 6 14:22:42 2024 +0800
Support show-queries and kill-query
---
.../apache/iotdb/itbase/constant/TestConstant.java | 2 +-
.../it/partition/IoTDBTimePartitionIT.java | 2 +-
.../IoTDBRegionMigrateReliabilityITFramework.java | 2 +-
.../IoTDBRemoveDataNodeITFramework.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBExampleIT.java | 2 +-
.../apache/iotdb/db/it/IoTDBExecuteBatchIT.java | 2 +-
.../apache/iotdb/db/it/IoTDBFilterBetweenIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBFilterNullIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBInsertNaNIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBNestedQueryIT.java | 2 +-
.../org/apache/iotdb/db/it/IoTDBRestServiceIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java | 2 +-
.../db/it/IoTDBSyntaxConventionIdentifierIT.java | 2 +-
.../it/IoTDBSyntaxConventionStringLiteralIT.java | 2 +-
.../it/aggregation/IoTDBAggregationByLevelIT.java | 2 +-
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 2 +-
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 2 +-
.../org/apache/iotdb/db/it/auth/IoTDBAuthIT.java | 2 +-
.../iotdb/db/it/auth/IoTDBClusterAuthorityIT.java | 2 +-
.../iotdb/db/it/auth/IoTDBSeriesPermissionIT.java | 22 +-
.../db/it/auth/IoTDBTemplatePermissionIT.java | 4 +-
.../it/last/IoTDBLastQueryWithLimitOffsetIT.java | 2 +-
.../iotdb/db/it/last/IoTDBLastWithTTLIT.java | 2 +-
.../apache/iotdb/db/it/query/IoTDBResultSetIT.java | 2 +-
.../db/it/schema/IoTDBAutoCreateSchemaIT.java | 2 +-
.../it/schema/IoTDBCreateAlignedTimeseriesIT.java | 2 +-
.../db/it/schema/IoTDBCreateStorageGroupIT.java | 2 +-
.../db/it/schema/IoTDBCreateTimeseriesIT.java | 2 +-
.../it/schema/IoTDBDeleteAlignedTimeseriesIT.java | 2 +-
.../iotdb/db/it/schema/IoTDBSchemaTemplateIT.java | 2 +-
.../db/it/schema/IoTDBSortedShowTimeseriesIT.java | 2 +-
.../apache/iotdb/db/it/schema/IoTDBTagAlterIT.java | 2 +-
.../org/apache/iotdb/db/it/schema/IoTDBTagIT.java | 2 +-
.../apache/iotdb/db/it/schema/IoTDBTagLimitIT.java | 2 +-
.../db/it/strangepath/IoTDBStrangePathIT.java | 2 +-
.../db/it/trigger/IoTDBTriggerManagementIT.java | 2 +-
.../iotdb/db/it/udaf/IoTDBUDAFGroupByLevelIT.java | 2 +-
.../iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java | 2 +-
.../pipe/it/autocreate/IoTDBPipeAutoDropIT.java | 2 +-
.../pipe/it/manual/IoTDBPipeMetaHistoricalIT.java | 2 +-
.../it/query/old/IoTDBSimpleQueryTableIT.java | 2 +-
.../aligned/IoTDBAlignedSeriesQueryTableIT.java | 2 +-
.../it/query/old/query/IoTDBResultSetTableIT.java | 2 +-
.../relational/it/schema/IoTDBDatabaseIT.java | 4 +-
.../iotdb/relational/it/schema/IoTDBTableIT.java | 6 +-
.../it/session/IoTDBTableModelSessionIT.java | 2 +-
.../session/pool/IoTDBTableModelSessionPoolIT.java | 2 +-
.../org/apache/iotdb/util/AbstractSchemaIT.java | 2 +-
.../apache/iotdb/tool/data/AbstractDataTool.java | 2 +-
.../payload/PipeTransferConfigSnapshotSealReq.java | 2 +-
.../receiver/protocol/IoTDBConfigNodeReceiver.java | 2 +-
.../iotdb/confignode/persistence/AuthorInfo.java | 2 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 6 +-
.../request/PipeTransferSchemaSnapshotSealReq.java | 2 +-
.../protocol/thrift/IoTDBDataNodeReceiver.java | 2 +-
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 2 +-
.../queryengine/common/header/DatasetHeader.java | 1 +
.../common/header/DatasetHeaderFactory.java | 2 +
.../operator/process/DeviceViewIntoOperator.java | 4 +-
.../execution/operator/process/IntoOperator.java | 4 +-
.../schema/NodeManageMemoryMergeOperator.java | 4 +-
.../operator/schema/NodePathsConvertOperator.java | 4 +-
.../operator/schema/NodePathsCountOperator.java | 4 +-
.../schema/SchemaQueryOrderByHeatOperator.java | 4 +-
.../operator/schema/SchemaQueryScanOperator.java | 2 +-
.../schema/source/DeviceAttributeUpdater.java | 2 +-
.../schema/source/DeviceBlackListConstructor.java | 2 +-
.../schema/source/DevicePredicateFilter.java | 2 +-
.../schema/source/DevicePredicateHandler.java | 2 +-
.../operator/schema/source/DeviceSchemaSource.java | 4 +-
.../operator/schema/source/DeviceUpdater.java | 2 +-
.../operator/schema/source/ISchemaSource.java | 2 +-
.../schema/source/LogicalViewSchemaSource.java | 4 +-
.../operator/schema/source/NodeSchemaSource.java | 4 +-
.../schema/source/PathsUsingTemplateSource.java | 4 +-
.../schema/source/SchemaSourceFactory.java | 2 +-
.../schema/source/TableDeviceFetchSource.java | 2 +-
.../schema/source/TableDeviceQuerySource.java | 2 +-
.../schema/source/TimeSeriesSchemaSource.java | 4 +-
.../source/ActiveDeviceRegionScanOperator.java | 4 +-
.../source/ActiveTimeSeriesRegionScanOperator.java | 4 +-
.../InformationSchemaContentSupplierFactory.java | 91 +++++
.../InformationSchemaTableScanOperator.java | 105 ++++++
.../iotdb/db/queryengine/plan/Coordinator.java | 25 +-
.../queryengine/plan/analyze/AnalyzeVisitor.java | 8 +-
.../plan/analyze/ExpressionAnalyzer.java | 2 +-
.../plan/analyze/TemplatedAggregationAnalyze.java | 2 +-
.../plan/execution/IQueryExecution.java | 2 +
.../queryengine/plan/execution/QueryExecution.java | 5 +
.../plan/execution/config/ConfigExecution.java | 5 +
.../execution/config/TableConfigTaskVisitor.java | 10 +
.../config/metadata/CountDatabaseTask.java | 2 +-
.../config/metadata/CountTimeSlotListTask.java | 4 +-
.../execution/config/metadata/GetRegionIdTask.java | 4 +-
.../config/metadata/GetSeriesSlotListTask.java | 4 +-
.../config/metadata/GetTimeSlotListTask.java | 4 +-
.../execution/config/metadata/ShowAINodesTask.java | 4 +-
.../config/metadata/ShowClusterDetailsTask.java | 10 +-
.../config/metadata/ShowClusterIdTask.java | 4 +-
.../execution/config/metadata/ShowClusterTask.java | 10 +-
.../config/metadata/ShowConfigNodesTask.java | 4 +-
.../config/metadata/ShowContinuousQueriesTask.java | 4 +-
.../config/metadata/ShowDataNodesTask.java | 4 +-
.../config/metadata/ShowFunctionsTask.java | 4 +-
.../config/metadata/ShowPipePluginsTask.java | 4 +-
.../execution/config/metadata/ShowRegionTask.java | 4 +-
.../execution/config/metadata/ShowTTLTask.java | 4 +-
.../config/metadata/ShowTriggersTask.java | 4 +-
.../config/metadata/ShowVariablesTask.java | 4 +-
.../config/metadata/model/ShowModelsTask.java | 4 +-
.../metadata/relational/DeleteDeviceTask.java | 2 +-
.../relational/DescribeTableDetailsTask.java | 4 +-
.../metadata/relational/DescribeTableTask.java | 4 +-
.../metadata/relational/ShowAINodesTask.java | 4 +-
.../metadata/relational/ShowConfigNodesTask.java | 4 +-
.../config/metadata/relational/ShowDBTask.java | 4 +-
.../metadata/relational/ShowDataNodesTask.java | 4 +-
.../metadata/relational/ShowTablesDetailsTask.java | 4 +-
.../config/metadata/relational/ShowTablesTask.java | 4 +-
.../template/ShowNodesInSchemaTemplateTask.java | 4 +-
.../metadata/template/ShowPathSetTemplateTask.java | 4 +-
.../metadata/template/ShowSchemaTemplateTask.java | 4 +-
.../config/session/ShowCurrentDatabaseTask.java | 4 +-
.../config/session/ShowCurrentSqlDialectTask.java | 4 +-
.../config/session/ShowCurrentUserTask.java | 4 +-
.../plan/execution/config/sys/KillQueryTask.java | 5 +
.../execution/config/sys/TestConnectionTask.java | 4 +-
.../execution/config/sys/pipe/ShowPipeTask.java | 4 +-
.../config/sys/quota/ShowSpaceQuotaTask.java | 4 +-
.../config/sys/quota/ShowThrottleQuotaTask.java | 4 +-
.../sys/subscription/ShowSubscriptionsTask.java | 4 +-
.../config/sys/subscription/ShowTopicsTask.java | 4 +-
.../memory/StatementMemorySourceVisitor.java | 4 +-
.../TableModelStatementMemorySourceVisitor.java | 5 +-
.../BindTypeForTimeSeriesOperandVisitor.java | 2 +-
.../plan/optimization/AggregationPushDown.java | 2 +-
.../db/queryengine/plan/parser/ASTVisitor.java | 2 +-
.../plan/planner/LogicalPlanBuilder.java | 6 +-
.../plan/planner/LogicalPlanVisitor.java | 4 +-
.../plan/planner/TableOperatorGenerator.java | 32 +-
.../plan/planner/TemplatedLogicalPlan.java | 4 +-
.../plan/planner/TemplatedLogicalPlanBuilder.java | 2 +-
.../plan/planner/plan/PlanFragment.java | 14 +
.../plan/planner/plan/node/ExplainAnalyzeNode.java | 2 +-
.../plan/planner/plan/node/PlanGraphPrinter.java | 28 +-
.../plan/planner/plan/node/PlanNodeType.java | 9 +-
.../plan/planner/plan/node/PlanVisitor.java | 12 +-
.../plan/node/metadata/read/DevicesCountNode.java | 4 +-
.../node/metadata/read/DevicesSchemaScanNode.java | 4 +-
.../metadata/read/LevelTimeSeriesCountNode.java | 4 +-
.../metadata/read/LogicalViewSchemaScanNode.java | 4 +-
.../metadata/read/NodePathsSchemaScanNode.java | 4 +-
.../metadata/read/PathsUsingTemplateScanNode.java | 4 +-
.../metadata/read/SchemaQueryOrderByHeatNode.java | 2 +-
.../node/metadata/read/TableDeviceSourceNode.java | 2 +-
.../node/metadata/read/TimeSeriesCountNode.java | 4 +-
.../metadata/read/TimeSeriesSchemaScanNode.java | 4 +-
.../node/process/ActiveRegionScanMergeNode.java | 4 +-
.../planner/plan/node/process/AggregationNode.java | 2 +-
.../plan/node/process/DeviceViewIntoNode.java | 4 +-
.../plan/planner/plan/node/process/IntoNode.java | 4 +-
.../plan/node/process/RawDataAggregationNode.java | 2 +-
.../node/process/SlidingWindowAggregationNode.java | 2 +-
.../plan/node/source/DeviceRegionScanNode.java | 4 +-
.../plan/node/source/LastQueryScanNode.java | 2 +-
.../node/source/SeriesAggregationSourceNode.java | 2 +-
.../planner/plan/node/source/ShowQueriesNode.java | 2 +-
.../plan/node/source/TimeseriesRegionScanNode.java | 4 +-
.../plan/relational/analyzer/Analysis.java | 5 +-
.../plan/relational/analyzer/Analyzer.java | 24 +-
.../relational/metadata/TableMetadataImpl.java | 14 +-
.../metadata/fetcher/TableDeviceSchemaFetcher.java | 2 +-
.../plan/relational/planner/RelationPlanner.java | 18 +-
.../relational/planner/TableLogicalPlanner.java | 4 +-
.../plan/relational/planner/TableModelPlanner.java | 19 +-
.../distribute/TableDistributedPlanGenerator.java | 99 ++++--
.../distribute/TableDistributedPlanner.java | 15 +-
.../distribute/TableModelQueryFragmentPlanner.java | 2 +-
.../rule/EliminateLimitProjectWithTableScan.java | 9 +-
.../rule/EliminateLimitWithTableScan.java | 9 +-
.../iterative/rule/PruneTableScanColumns.java | 61 ++--
.../planner/node/AggregationTableScanNode.java | 6 +-
...TableScanNode.java => DeviceTableScanNode.java} | 222 ++----------
.../node/InformationSchemaTableScanNode.java | 212 ++++++++++++
.../relational/planner/node/TableScanNode.java | 298 +---------------
.../node/schema/AbstractTableDeviceQueryNode.java | 2 +-
.../schema/TableDeviceAttributeUpdateNode.java | 2 +-
.../planner/node/schema/TableDeviceFetchNode.java | 2 +-
.../node/schema/TableDeviceQueryCountNode.java | 2 +-
.../node/schema/TableDeviceQueryScanNode.java | 2 +-
.../DataNodeLocationSupplierFactory.java | 90 +++++
.../PushAggregationIntoTableScan.java | 20 +-
.../PushLimitOffsetIntoTableScan.java | 42 ++-
.../optimizations/PushPredicateIntoTableScan.java | 28 +-
.../planner/optimizations/SortElimination.java | 8 +-
.../TransformAggregationToStreamable.java | 4 +-
.../optimizations/TransformSortToStreamSort.java | 24 +-
.../optimizations/UnaliasSymbolReferences.java | 35 +-
.../sql/ast/AbstractQueryDeviceWithCache.java | 2 +-
.../relational/sql/ast/AbstractTraverseDevice.java | 2 +-
.../plan/relational/sql/ast/AstVisitor.java | 8 +
.../plan/relational/sql/ast/CountDevice.java | 2 +-
.../plan/relational/sql/ast/DeleteDevice.java | 2 +-
.../plan/relational/sql/ast/KillQuery.java | 81 +++++
.../plan/relational/sql/ast/ShowDevice.java | 2 +-
.../plan/relational/sql/ast/ShowStatement.java | 116 +++++++
.../plan/relational/sql/parser/AstBuilder.java | 35 +-
.../plan/relational/sql/rewrite/ShowRewrite.java | 102 ++++++
.../relational/sql/rewrite/StatementRewrite.java | 67 ++++
.../sql/rewrite/StatementRewriteFactory.java | 35 ++
.../statement/metadata/ShowDatabaseStatement.java | 4 +-
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 2 +-
.../SlidingTimeColumnGeneratorParameter.java | 2 +-
.../SchemaRegionSimpleRecoverTest.java | 2 +-
.../queryengine/execution/ConfigExecutionTest.java | 2 +-
.../operator/MergeTreeSortOperatorTest.java | 6 +
.../schema/SchemaQueryScanOperatorTest.java | 4 +-
.../db/queryengine/plan/analyze/AnalyzeTest.java | 4 +-
.../plan/optimization/TestPlanBuilder.java | 2 +-
.../logical/DataQueryLogicalPlannerTest.java | 2 +-
.../plan/relational/analyzer/AnalyzerTest.java | 373 +++++++++++----------
.../plan/relational/analyzer/AuthTest.java | 4 +
.../plan/relational/analyzer/JoinTest.java | 85 ++---
.../analyzer/LimitOffsetPushDownTest.java | 189 ++++++-----
.../analyzer/MockTableModelDataPartition.java | 2 +-
.../plan/relational/analyzer/ShowQueriesTest.java | 105 ++++++
.../plan/relational/analyzer/SortTest.java | 215 ++++++------
.../plan/relational/analyzer/SubQueryTest.java | 143 ++++----
.../plan/relational/analyzer/TestMatadata.java | 23 ++
.../plan/relational/analyzer/TestPlanBuilder.java | 6 +-
.../plan/relational/analyzer/TestUtils.java | 30 +-
.../fetcher/cache/TableDeviceSchemaCacheTest.java | 2 +-
.../plan/relational/planner/PlanTester.java | 24 +-
...java => AggregationDeviceTableScanMatcher.java} | 4 +-
.../planner/assertions/ColumnReference.java | 10 +-
.../planner/assertions/DeviceTableScanMatcher.java | 50 +++
.../InformationSchemaTableScanMatcher.java | 82 +++++
.../planner/assertions/PlanMatchPattern.java | 24 +-
.../planner/assertions/SymbolAliases.java | 2 +-
.../planner/assertions/TableScanMatcher.java | 19 +-
.../iotdb/commons/schema/column}/ColumnHeader.java | 2 +-
.../schema/column}/ColumnHeaderConstant.java | 7 +-
.../schema/table/InformationSchemaTable.java | 96 ++++++
.../apache/iotdb/commons/schema/table/TsTable.java | 8 +
245 files changed, 2678 insertions(+), 1438 deletions(-)
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/TestConstant.java b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/TestConstant.java
index 65be357a918..8a9d11516c5 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/constant/TestConstant.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/constant/TestConstant.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.itbase.constant;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.tsfile.utils.FilePathUtils;
import org.apache.tsfile.write.record.TSRecord;
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBTimePartitionIT.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBTimePartitionIT.java
index 771e7cdc505..469d6974cb5 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBTimePartitionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBTimePartitionIT.java
@@ -22,11 +22,11 @@ package org.apache.iotdb.confignode.it.partition;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.SchemaConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.TimePartitionUtils;
import org.apache.iotdb.confignode.rpc.thrift.TGetDatabaseReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowDatabaseResp;
import org.apache.iotdb.consensus.ConsensusFactory;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowDatabaseStatement;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.iotdb.it.env.EnvFactory;
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/IoTDBRegionMigrateReliabilityITFramework.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/IoTDBRegionMigrateReliabilityITFramework.java
index a89b5b7482e..d82022587a5 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/IoTDBRegionMigrateReliabilityITFramework.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/regionmigration/IoTDBRegionMigrateReliabilityITFramework.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.KillPoint.KillNode;
import org.apache.iotdb.commons.utils.KillPoint.KillPoint;
import org.apache.iotdb.confignode.rpc.thrift.TRegionInfo;
@@ -30,7 +31,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.consensus.iot.IoTConsensusServerImpl;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.env.cluster.env.AbstractEnv;
import org.apache.iotdb.it.env.cluster.node.AbstractNodeWrapper;
diff --git a/integration-test/src/test/java/org/apache/iotdb/confignode/it/removedatanode/IoTDBRemoveDataNodeITFramework.java b/integration-test/src/test/java/org/apache/iotdb/confignode/it/removedatanode/IoTDBRemoveDataNodeITFramework.java
index 490696005ea..5082c7beda0 100644
--- a/integration-test/src/test/java/org/apache/iotdb/confignode/it/removedatanode/IoTDBRemoveDataNodeITFramework.java
+++ b/integration-test/src/test/java/org/apache/iotdb/confignode/it/removedatanode/IoTDBRemoveDataNodeITFramework.java
@@ -22,10 +22,10 @@ package org.apache.iotdb.confignode.it.removedatanode;
import org.apache.iotdb.common.rpc.thrift.TDataNodeConfiguration;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRemoveReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRemoveResp;
import org.apache.iotdb.consensus.ConsensusFactory;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
import org.apache.iotdb.itbase.exception.InconsistentDataException;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java
index 424195bdd37..be8ddabeb2c 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExampleIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExecuteBatchIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExecuteBatchIT.java
index f1822fd4bb4..61ba53f8bd4 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExecuteBatchIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBExecuteBatchIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterBetweenIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterBetweenIT.java
index 2ce213eb0b0..0ecd4d88f90 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterBetweenIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterBetweenIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java
index 705f4b8d9ed..a7acbaebaa9 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBFilterNullIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertNaNIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertNaNIT.java
index 7d37908d609..a0ffd6e383f 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertNaNIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBInsertNaNIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java
index 7483eca6c84..0b9d310c767 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.it;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.it.utils.TsFileGenerator;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBNestedQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBNestedQueryIT.java
index f60bacb0fd0..f866d90aa5a 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBNestedQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBNestedQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java
index f6e3861218d..7cde457761c 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestServiceIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
@@ -53,7 +53,7 @@ import java.util.Base64;
import java.util.List;
import java.util.Map;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.COLUMN_TTL;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.COLUMN_TTL;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java
index e7bf18b4fd8..39701880473 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSimpleQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
index 247255cdfb6..f10ef254856 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionIdentifierIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
index 7b682ffac82..80bba7f4877 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBSyntaxConventionStringLiteralIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevelIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevelIT.java
index 5f0beea7dcc..19c76c7c4f2 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevelIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aggregation/IoTDBAggregationByLevelIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it.aggregation;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java
index fc866ea4224..514757ccbac 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedLastQueryIT.java
@@ -18,8 +18,8 @@
*/
package org.apache.iotdb.db.it.aligned;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.it.utils.AlignedWriteUtil;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java
index 016e2d59daa..64ef1268531 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java
@@ -18,8 +18,8 @@
*/
package org.apache.iotdb.db.it.aligned;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.it.utils.AlignedWriteUtil;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java
index 93165a16ff6..6b719b357d2 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.it.auth;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBClusterAuthorityIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBClusterAuthorityIT.java
index ef9c147a742..d38ba6dac4e 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBClusterAuthorityIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBClusterAuthorityIT.java
@@ -24,12 +24,12 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.AuthUtils;
import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerReq;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerResp;
import org.apache.iotdb.confignode.rpc.thrift.TCheckUserPrivilegesReq;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.statement.AuthorType;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java
index eee4a86dc08..822086c58ca 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBSeriesPermissionIT.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.it.auth;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
@@ -32,22 +32,22 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.TIME;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.countDevicesColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.countNodesColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.countTimeSeriesColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showChildNodesColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showChildPathsColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showDevicesColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showStorageGroupsColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTTLColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTimeSeriesColumnHeaders;
import static org.apache.iotdb.db.it.utils.TestUtils.assertNonQueryTestFail;
import static org.apache.iotdb.db.it.utils.TestUtils.createUser;
import static org.apache.iotdb.db.it.utils.TestUtils.executeNonQuery;
import static org.apache.iotdb.db.it.utils.TestUtils.grantUserSeriesPrivilege;
import static org.apache.iotdb.db.it.utils.TestUtils.grantUserSystemPrivileges;
import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualTest;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.TIME;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.countDevicesColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.countNodesColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.countTimeSeriesColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showChildNodesColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showChildPathsColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showDevicesColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showStorageGroupsColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showTTLColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showTimeSeriesColumnHeaders;
@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBTemplatePermissionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBTemplatePermissionIT.java
index 7ac8a1e96a5..52f6e01fc69 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBTemplatePermissionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBTemplatePermissionIT.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.it.auth;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
@@ -32,13 +32,13 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showPathsUsingTemplateHeaders;
import static org.apache.iotdb.db.it.utils.TestUtils.assertNonQueryTestFail;
import static org.apache.iotdb.db.it.utils.TestUtils.createUser;
import static org.apache.iotdb.db.it.utils.TestUtils.executeNonQuery;
import static org.apache.iotdb.db.it.utils.TestUtils.grantUserSeriesPrivilege;
import static org.apache.iotdb.db.it.utils.TestUtils.resultSetEqualTest;
import static org.apache.iotdb.db.it.utils.TestUtils.revokeUserSeriesPrivilege;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showPathsUsingTemplateHeaders;
/**
* This Class contains integration tests for SystemPermissions but {@link PrivilegeType#MANAGE_USER}
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryWithLimitOffsetIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryWithLimitOffsetIT.java
index 0de811ff271..995367f10ad 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryWithLimitOffsetIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastQueryWithLimitOffsetIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.last;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastWithTTLIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastWithTTLIT.java
index a09f2ade118..b69af5ab017 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastWithTTLIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/last/IoTDBLastWithTTLIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it.last;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBResultSetIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBResultSetIT.java
index 1385d42872d..33648973284 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBResultSetIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBResultSetIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.query;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAutoCreateSchemaIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAutoCreateSchemaIT.java
index 8d0380bba72..5453fdc9ab1 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAutoCreateSchemaIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAutoCreateSchemaIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateAlignedTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateAlignedTimeseriesIT.java
index 6a00ece6783..7fdeff084c3 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateAlignedTimeseriesIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateAlignedTimeseriesIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateStorageGroupIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateStorageGroupIT.java
index 84dc7b72f47..d19ea2fa940 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateStorageGroupIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateStorageGroupIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateTimeseriesIT.java
index 9bb22ea599a..ab16fb56248 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateTimeseriesIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateTimeseriesIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteAlignedTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteAlignedTimeseriesIT.java
index ab7c7a8fa88..85a75b844a0 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteAlignedTimeseriesIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteAlignedTimeseriesIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.util.AbstractSchemaIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java
index ecc16af137c..1f4445ddb46 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSortedShowTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSortedShowTimeseriesIT.java
index d68e7684407..8c70e76c1fc 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSortedShowTimeseriesIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSortedShowTimeseriesIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagAlterIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagAlterIT.java
index f4abc050073..feb49793c08 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagAlterIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagAlterIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagIT.java
index 0fc239067d8..2dd80c2bba0 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagLimitIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagLimitIT.java
index aea1e514151..3e2df365d56 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagLimitIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagLimitIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterIT;
import org.apache.iotdb.itbase.category.LocalStandaloneIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/strangepath/IoTDBStrangePathIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/strangepath/IoTDBStrangePathIT.java
index 8e022abf93f..ad60775936c 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/strangepath/IoTDBStrangePathIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/strangepath/IoTDBStrangePathIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.strangepath;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/trigger/IoTDBTriggerManagementIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/trigger/IoTDBTriggerManagementIT.java
index cb21faa628d..9a78ca427c0 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/trigger/IoTDBTriggerManagementIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/trigger/IoTDBTriggerManagementIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.trigger;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udaf/IoTDBUDAFGroupByLevelIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udaf/IoTDBUDAFGroupByLevelIT.java
index fc5833a2924..35447f29574 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udaf/IoTDBUDAFGroupByLevelIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udaf/IoTDBUDAFGroupByLevelIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.it.udaf;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
index abdae02a0fd..25c981d2cd6 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFHybridQueryIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.it.udf;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoDropIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoDropIT.java
index 89c7dcc4530..c30006a73f4 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoDropIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoDropIT.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.pipe.it.autocreate;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
import org.apache.iotdb.commons.pipe.agent.task.meta.PipeStaticMeta;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.db.it.utils.TestUtils;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema;
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java
index 601f92f98fe..dcda6dbdb3d 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaHistoricalIT.java
@@ -21,10 +21,10 @@ package org.apache.iotdb.pipe.it.manual;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.client.sync.SyncConfigNodeIServiceClient;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.db.it.utils.TestUtils;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.it.env.MultiEnvFactory;
import org.apache.iotdb.it.env.cluster.node.DataNodeWrapper;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java
index 92a174d1a82..e615c779d1f 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBSimpleQueryTableIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.relational.it.query.old;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java
index b8c397bc531..8ddb2a62232 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/aligned/IoTDBAlignedSeriesQueryTableIT.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.relational.it.query.old.aligned;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBResultSetTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBResultSetTableIT.java
index 9fbc4da1950..ddd9417f1df 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBResultSetTableIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/query/IoTDBResultSetTableIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.relational.it.query.old.query;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.TableClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
index ec064d506d6..c48f10a7f2f 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java
@@ -39,8 +39,8 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collections;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showDBColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showDBDetailsColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showDBColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showDBDetailsColumnHeaders;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java
index 981c1c7b22a..3ef1e8ecd11 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java
@@ -39,9 +39,9 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collections;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.describeTableColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.describeTableDetailsColumnHeaders;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showTablesColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.describeTableColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.describeTableDetailsColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTablesColumnHeaders;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.fail;
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBTableModelSessionIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBTableModelSessionIT.java
index a1144665053..a8392a80dfc 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBTableModelSessionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBTableModelSessionIT.java
@@ -35,7 +35,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showTablesColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTablesColumnHeaders;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBTableModelSessionPoolIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBTableModelSessionPoolIT.java
index 52b7febdff6..52103dcc0c9 100644
--- a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBTableModelSessionPoolIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBTableModelSessionPoolIT.java
@@ -36,7 +36,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.showTablesColumnHeaders;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.showTablesColumnHeaders;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
diff --git a/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java b/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
index 7b8c2cb74db..5ff95dee1d1 100644
--- a/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.util;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunnerWithParametersFactory;
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/AbstractDataTool.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/AbstractDataTool.java
index 3f095454f76..f530632283b 100644
--- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/AbstractDataTool.java
+++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/AbstractDataTool.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.tool.data;
import org.apache.iotdb.cli.utils.IoTPrinter;
import org.apache.iotdb.commons.exception.IllegalPathException;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.PathUtils;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.utils.DateTimeUtils;
import org.apache.iotdb.db.utils.constant.SqlConstant;
import org.apache.iotdb.exception.ArgsErrorException;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotSealReq.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotSealReq.java
index 07664f6523c..183033f011c 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotSealReq.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/connector/payload/PipeTransferConfigSnapshotSealReq.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.confignode.manager.pipe.connector.payload;
import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV2;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.persistence.schema.CNSnapshotFileType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
index 67167500033..4da078d2db0 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/receiver/protocol/IoTDBConfigNodeReceiver.java
@@ -29,6 +29,7 @@ import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransf
import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern;
import org.apache.iotdb.commons.pipe.receiver.IoTDBFileReceiver;
import org.apache.iotdb.commons.pipe.receiver.PipeReceiverStatusHandler;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.ttl.TTLCache;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
@@ -68,7 +69,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TSetSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
import org.apache.iotdb.confignode.service.ConfigNode;
import org.apache.iotdb.consensus.exception.ConsensusException;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
index 61100f199f0..3f3b8cffc88 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
@@ -32,6 +32,7 @@ import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.snapshot.SnapshotProcessor;
import org.apache.iotdb.commons.utils.AuthUtils;
import org.apache.iotdb.commons.utils.FileUtils;
@@ -45,7 +46,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TPathPrivilege;
import org.apache.iotdb.confignode.rpc.thrift.TPermissionInfoResp;
import org.apache.iotdb.confignode.rpc.thrift.TRoleResp;
import org.apache.iotdb.confignode.rpc.thrift.TUserResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
index 9114452e055..06009372d79 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
@@ -25,14 +25,14 @@ import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics;
import org.apache.iotdb.confignode.rpc.thrift.TAuthorizerResp;
import org.apache.iotdb.confignode.rpc.thrift.TPathPrivilege;
import org.apache.iotdb.confignode.rpc.thrift.TRoleResp;
import org.apache.iotdb.confignode.rpc.thrift.TUserResp;
import org.apache.iotdb.db.protocol.session.IClientSession;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
@@ -54,7 +54,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.LIST_USER_PRIVILEGES_Column_HEADERS;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.LIST_USER_PRIVILEGES_Column_HEADERS;
// Authority checker is SingleTon working at datanode.
// It checks permission in local. DCL statement will send to confignode.
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java
index 70835e0ea4f..31065b56ba0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferSchemaSnapshotSealReq.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.pipe.connector.payload.evolvable.request;
import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeRequestType;
import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransferFileSealReqV2;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import java.io.IOException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
index f7bcb08b534..c6ec711eb10 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
@@ -33,6 +33,7 @@ import org.apache.iotdb.commons.pipe.connector.payload.thrift.request.PipeTransf
import org.apache.iotdb.commons.pipe.datastructure.pattern.IoTDBTreePattern;
import org.apache.iotdb.commons.pipe.receiver.IoTDBFileReceiver;
import org.apache.iotdb.commons.pipe.receiver.PipeReceiverStatusHandler;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.confignode.rpc.thrift.TDatabaseSchema;
import org.apache.iotdb.db.auth.AuthorityChecker;
@@ -68,7 +69,6 @@ import org.apache.iotdb.db.pipe.receiver.visitor.PipeStatementToBatchVisitor;
import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.protocol.session.SessionManager;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
import org.apache.iotdb.db.queryengine.plan.analyze.ClusterPartitionFetcher;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.ClusterSchemaFetcher;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
index d038c07cbe7..092881722f1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
@@ -41,6 +41,7 @@ import org.apache.iotdb.commons.path.IFullPath;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.NonAlignedFullPath;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.iotdb.commons.utils.TimePartitionUtils;
import org.apache.iotdb.db.audit.AuditLogger;
@@ -59,7 +60,6 @@ import org.apache.iotdb.db.queryengine.common.FragmentInstanceId;
import org.apache.iotdb.db.queryengine.common.PlanFragmentId;
import org.apache.iotdb.db.queryengine.common.QueryId;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeader.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeader.java
index 8eb177dea8d..a72c4d00bef 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeader.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeader.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.queryengine.common.header;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeaderFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeaderFactory.java
index 5c9360fd009..aefccf9aef4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeaderFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/DatasetHeaderFactory.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.db.queryengine.common.header;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
+
public class DatasetHeaderFactory {
private DatasetHeaderFactory() {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewIntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewIntoOperator.java
index 3619b76f64c..2842ee421f5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewIntoOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/DeviceViewIntoOperator.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.execution.operator.process;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/IntoOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/IntoOperator.java
index 8c8f3e7fe70..c3cc3dcb01b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/IntoOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/process/IntoOperator.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.execution.operator.process;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodeManageMemoryMergeOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodeManageMemoryMergeOperator.java
index 7fc4f92d5de..f9a7113ed6c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodeManageMemoryMergeOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodeManageMemoryMergeOperator.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema;
import org.apache.iotdb.common.rpc.thrift.TSchemaNode;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.node.MNodeType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodePathsConvertOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodePathsConvertOperator.java
index d9578a28a85..7fe9914ab0c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodePathsConvertOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodePathsConvertOperator.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodePathsCountOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodePathsCountOperator.java
index d709e5dbc26..e253ca774a4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodePathsCountOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/NodePathsCountOperator.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryOrderByHeatOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryOrderByHeatOperator.java
index 45c2338dfab..fe9f4355ab2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryOrderByHeatOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryOrderByHeatOperator.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.operator.Operator;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryScanOperator.java
index adb7a4974e3..9ff786c3851 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryScanOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryScanOperator.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceAttributeUpdater.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceAttributeUpdater.java
index 08ee5b68c50..a1d04887145 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceAttributeUpdater.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceAttributeUpdater.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.exception.MetadataException;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.node.role.IDeviceMNode;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceBlackListConstructor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceBlackListConstructor.java
index 912420c134b..d29a9ea65c3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceBlackListConstructor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceBlackListConstructor.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.exception.MetadataException;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.node.role.IDeviceMNode;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.rescon.MemSchemaRegionStatistics;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java
index f79fc3c3549..055a22460b2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateFilter.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateHandler.java
index 755bd47572f..a33f17f002d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DevicePredicateHandler.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.exception.MetadataException;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceSchemaSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceSchemaSource.java
index c803388b054..c655cf9eae4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceSchemaSource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceSchemaSource.java
@@ -25,9 +25,9 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.commons.schema.SchemaConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache;
import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.read.req.SchemaRegionReadPlanFactory;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceUpdater.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceUpdater.java
index ed30ba1ba99..1a5e5e4632c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceUpdater.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/DeviceUpdater.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.exception.MetadataException;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.node.role.IDeviceMNode;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
import org.apache.iotdb.db.queryengine.transformation.dag.column.leaf.LeafColumnTransformer;
import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/ISchemaSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/ISchemaSource.java
index c71b2cb6db7..3a81ccf3ecb 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/ISchemaSource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/ISchemaSource.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.SchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ISchemaInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/LogicalViewSchemaSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/LogicalViewSchemaSource.java
index 31736e0f101..f1eaaebbd1d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/LogicalViewSchemaSource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/LogicalViewSchemaSource.java
@@ -23,12 +23,12 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.filter.SchemaFilterFactory;
import org.apache.iotdb.commons.schema.view.LogicalViewSchema;
import org.apache.iotdb.commons.schema.view.ViewType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.read.req.SchemaRegionReadPlanFactory;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/NodeSchemaSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/NodeSchemaSource.java
index 3f575c20343..c3f87195208 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/NodeSchemaSource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/NodeSchemaSource.java
@@ -23,8 +23,8 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.read.req.IShowNodesPlan;
import org.apache.iotdb.db.schemaengine.schemaregion.read.req.SchemaRegionReadPlanFactory;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/PathsUsingTemplateSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/PathsUsingTemplateSource.java
index 131e240c633..fb5a08fcecc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/PathsUsingTemplateSource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/PathsUsingTemplateSource.java
@@ -22,8 +22,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.read.req.SchemaRegionReadPlanFactory;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/SchemaSourceFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/SchemaSourceFactory.java
index e72412c5f11..56f0964ce19 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/SchemaSourceFactory.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/SchemaSourceFactory.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.INodeSchemaInfo;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceFetchSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceFetchSource.java
index b976e826f04..d1b5995bfc4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceFetchSource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceFetchSource.java
@@ -21,10 +21,10 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.reader.ISchemaReader;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceQuerySource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceQuerySource.java
index 094a41277cb..919553d2f18 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceQuerySource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceQuerySource.java
@@ -21,12 +21,12 @@ package org.apache.iotdb.db.queryengine.execution.operator.schema.source;
import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.filter.impl.DeviceFilterUtil;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.IDeviceSchemaInfo;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.reader.ISchemaReader;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TimeSeriesSchemaSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TimeSeriesSchemaSource.java
index 47b73ccb0e5..5c13c958c02 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TimeSeriesSchemaSource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TimeSeriesSchemaSource.java
@@ -24,10 +24,10 @@ import org.apache.iotdb.commons.exception.runtime.SchemaExecutionException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.commons.schema.SchemaConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.view.ViewType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.schemaengine.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.schemaengine.schemaregion.read.req.SchemaRegionReadPlanFactory;
import org.apache.iotdb.db.schemaengine.schemaregion.read.resp.info.ITimeSeriesSchemaInfo;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ActiveDeviceRegionScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ActiveDeviceRegionScanOperator.java
index 777d2bf854d..fc6e624270d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ActiveDeviceRegionScanOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ActiveDeviceRegionScanOperator.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.execution.operator.source;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.schema.SchemaConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.DeviceContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeTTLCache;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ActiveTimeSeriesRegionScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ActiveTimeSeriesRegionScanOperator.java
index fcd73a4189e..2bf866fbd9a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ActiveTimeSeriesRegionScanOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/ActiveTimeSeriesRegionScanOperator.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.queryengine.execution.operator.source;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.TimeseriesContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java
new file mode 100644
index 00000000000..1fa7918d519
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaContentSupplierFactory.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.queryengine.execution.operator.source.relational;
+
+import org.apache.iotdb.db.queryengine.plan.Coordinator;
+import org.apache.iotdb.db.queryengine.plan.execution.IQueryExecution;
+
+import org.apache.tsfile.block.column.ColumnBuilder;
+import org.apache.tsfile.enums.TSDataType;
+import org.apache.tsfile.read.common.block.TsBlock;
+import org.apache.tsfile.read.common.block.TsBlockBuilder;
+import org.apache.tsfile.read.common.block.column.RunLengthEncodedColumn;
+import org.apache.tsfile.utils.BytesUtils;
+
+import java.util.Iterator;
+import java.util.List;
+
+import static org.apache.iotdb.commons.schema.table.InformationSchemaTable.QUERIES;
+
+public class InformationSchemaContentSupplierFactory {
+ private InformationSchemaContentSupplierFactory() {}
+
+ public static Iterator<TsBlock> getSupplier(String tableName, List<TSDataType> dataTypes) {
+ if (tableName.equals(QUERIES.getSchemaTableName())) {
+ return new Iterator<TsBlock>() {
+ private final TsBlockBuilder resultBuilder = new TsBlockBuilder(dataTypes);
+ private final ColumnBuilder[] columnBuilders = resultBuilder.getValueColumnBuilders();
+
+ private final List<IQueryExecution> queryExecutions =
+ Coordinator.getInstance().getAllQueryExecutions();
+
+ private final long currTime = System.currentTimeMillis();
+
+ private final int totalSize = queryExecutions.size();
+ private int nextConsumedIndex;
+
+ @Override
+ public boolean hasNext() {
+ return nextConsumedIndex < totalSize;
+ }
+
+ @Override
+ public TsBlock next() {
+ while (nextConsumedIndex < totalSize && !resultBuilder.isFull()) {
+
+ IQueryExecution queryExecution = queryExecutions.get(nextConsumedIndex);
+ String[] splits = queryExecution.getQueryId().split("_");
+ int dataNodeId = Integer.parseInt(splits[splits.length - 1]);
+
+ columnBuilders[0].writeLong(queryExecution.getStartExecutionTime());
+ columnBuilders[1].writeBinary(BytesUtils.valueOf(queryExecution.getQueryId()));
+ columnBuilders[2].writeInt(dataNodeId);
+ columnBuilders[3].writeFloat(
+ (float) (currTime - queryExecution.getStartExecutionTime()) / 1000);
+ columnBuilders[4].writeBinary(
+ BytesUtils.valueOf(queryExecution.getExecuteSQL().orElse("UNKNOWN")));
+ columnBuilders[5].writeBinary(BytesUtils.valueOf(queryExecution.getSQLDialect()));
+ resultBuilder.declarePosition();
+
+ nextConsumedIndex++;
+ }
+ TsBlock result =
+ resultBuilder.build(
+ new RunLengthEncodedColumn(
+ TableScanOperator.TIME_COLUMN_TEMPLATE, resultBuilder.getPositionCount()));
+ resultBuilder.reset();
+ return result;
+ }
+ };
+
+ } else {
+ throw new UnsupportedOperationException("Unknown table: " + tableName);
+ }
+ }
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaTableScanOperator.java
new file mode 100644
index 00000000000..0b2c5275a1b
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/InformationSchemaTableScanOperator.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.queryengine.execution.operator.source.relational;
+
+import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
+import org.apache.iotdb.db.queryengine.execution.operator.OperatorContext;
+import org.apache.iotdb.db.queryengine.execution.operator.source.SourceOperator;
+import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
+
+import org.apache.tsfile.common.conf.TSFileDescriptor;
+import org.apache.tsfile.read.common.block.TsBlock;
+import org.apache.tsfile.utils.RamUsageEstimator;
+
+import java.util.Iterator;
+
+public class InformationSchemaTableScanOperator implements SourceOperator {
+
+ private final OperatorContext operatorContext;
+
+ private final PlanNodeId sourceId;
+
+ private final Iterator<TsBlock> contentSupplier;
+
+ private static final int DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES =
+ TSFileDescriptor.getInstance().getConfig().getMaxTsBlockSizeInBytes();
+
+ private static final long INSTANCE_SIZE =
+ RamUsageEstimator.shallowSizeOfInstance(InformationSchemaTableScanOperator.class);
+
+ public InformationSchemaTableScanOperator(
+ OperatorContext operatorContext, PlanNodeId sourceId, Iterator<TsBlock> contentSupplier) {
+ this.operatorContext = operatorContext;
+ this.sourceId = sourceId;
+ this.contentSupplier = contentSupplier;
+ }
+
+ @Override
+ public OperatorContext getOperatorContext() {
+ return operatorContext;
+ }
+
+ @Override
+ public TsBlock next() throws Exception {
+ return contentSupplier.next();
+ }
+
+ @Override
+ public boolean hasNext() throws Exception {
+ return contentSupplier.hasNext();
+ }
+
+ @Override
+ public boolean isFinished() throws Exception {
+ return !hasNext();
+ }
+
+ @Override
+ public void close() throws Exception {
+ // do nothing
+ }
+
+ @Override
+ public long calculateMaxPeekMemory() {
+ return DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES;
+ }
+
+ @Override
+ public long calculateMaxReturnSize() {
+ return DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES;
+ }
+
+ @Override
+ public long calculateRetainedSizeAfterCallingNext() {
+ return 0L;
+ }
+
+ @Override
+ public PlanNodeId getSourceId() {
+ return sourceId;
+ }
+
+ @Override
+ public long ramBytesUsed() {
+ return INSTANCE_SIZE
+ + MemoryEstimationHelper.getEstimatedSizeOfAccountableObject(operatorContext)
+ + MemoryEstimationHelper.getEstimatedSizeOfAccountableObject(sourceId);
+ }
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java
index fa2f15fc74b..c3896cd60fd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java
@@ -49,6 +49,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.TreeModelPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext;
import org.apache.iotdb.db.queryengine.plan.relational.planner.TableModelPlanner;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.DataNodeLocationSupplierFactory;
import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.DistributedOptimizeFactory;
import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.LogicalOptimizeFactory;
import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanOptimizer;
@@ -64,6 +65,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropColumn;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropDB;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.KillQuery;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeStatement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetConfiguration;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SetProperties;
@@ -85,6 +87,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubscriptionState
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedInsertStatement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewrite;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewriteFactory;
import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager;
import org.apache.iotdb.db.queryengine.plan.statement.IConfigStatement;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;
@@ -140,15 +144,20 @@ public class Coordinator {
private final ConcurrentHashMap<Long, IQueryExecution> queryExecutionMap;
+ private final StatementRewrite statementRewrite;
private final List<PlanOptimizer> logicalPlanOptimizers;
private final List<PlanOptimizer> distributionPlanOptimizers;
private final AccessControl accessControl;
+ private final DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier;
private Coordinator() {
this.queryExecutionMap = new ConcurrentHashMap<>();
this.executor = getQueryExecutor();
this.writeOperationExecutor = getWriteExecutor();
this.scheduledExecutor = getScheduledExecutor();
+ this.statementRewrite =
+ new StatementRewriteFactory(LocalExecutionPlanner.getInstance().metadata)
+ .getStatementRewrite();
this.logicalPlanOptimizers =
new LogicalOptimizeFactory(
new PlannerContext(
@@ -160,6 +169,7 @@ public class Coordinator {
LocalExecutionPlanner.getInstance().metadata, new InternalTypeManager()))
.getPlanOptimizers();
this.accessControl = new AllowAllAccessControl();
+ this.dataNodeLocationSupplier = DataNodeLocationSupplierFactory.getSupplier();
}
private ExecutionResult execution(
@@ -337,9 +347,11 @@ public class Coordinator {
scheduledExecutor,
SYNC_INTERNAL_SERVICE_CLIENT_MANAGER,
ASYNC_INTERNAL_SERVICE_CLIENT_MANAGER,
+ statementRewrite,
logicalPlanOptimizers,
distributionPlanOptimizers,
- accessControl);
+ accessControl,
+ dataNodeLocationSupplier);
return new QueryExecution(tableModelPlanner, queryContext, executor);
}
@@ -382,7 +394,8 @@ public class Coordinator {
|| statement instanceof ShowVersion
|| statement instanceof ShowVariables
|| statement instanceof ShowClusterId
- || statement instanceof ShowCurrentTimestamp) {
+ || statement instanceof ShowCurrentTimestamp
+ || statement instanceof KillQuery) {
return new ConfigExecution(
queryContext,
null,
@@ -403,9 +416,11 @@ public class Coordinator {
scheduledExecutor,
SYNC_INTERNAL_SERVICE_CLIENT_MANAGER,
ASYNC_INTERNAL_SERVICE_CLIENT_MANAGER,
+ statementRewrite,
logicalPlanOptimizers,
distributionPlanOptimizers,
- accessControl);
+ accessControl,
+ dataNodeLocationSupplier);
return new QueryExecution(tableModelPlanner, queryContext, executor);
}
@@ -501,4 +516,8 @@ public class Coordinator {
public List<PlanOptimizer> getLogicalPlanOptimizers() {
return logicalPlanOptimizers;
}
+
+ public DataNodeLocationSupplierFactory.DataNodeLocationSupplier getDataNodeLocationSupplier() {
+ return dataNodeLocationSupplier;
+ }
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
index dd5f7ed93b2..3f787f0a3f2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
@@ -35,6 +35,8 @@ import org.apache.iotdb.commons.path.AlignedPath;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.view.LogicalViewSchema;
import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
import org.apache.iotdb.commons.service.metric.PerformanceOverviewMetrics;
@@ -54,8 +56,6 @@ import org.apache.iotdb.db.protocol.client.ConfigNodeInfo;
import org.apache.iotdb.db.queryengine.common.DeviceContext;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.TimeseriesContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.common.schematree.DeviceSchemaInfo;
@@ -202,8 +202,8 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.DEADBAND;
import static org.apache.iotdb.commons.conf.IoTDBConstant.LOSS;
import static org.apache.iotdb.commons.conf.IoTDBConstant.ONE_LEVEL_PATH_WILDCARD;
import static org.apache.iotdb.commons.schema.SchemaConstant.ALL_MATCH_PATTERN;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.DEVICE;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.ENDTIME;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DEVICE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ENDTIME;
import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.PARTITION_FETCHER;
import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.SCHEMA_FETCHER;
import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.TREE_TYPE;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
index 3df288cbdaa..a53ee3f7d32 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/ExpressionAnalyzer.java
@@ -23,11 +23,11 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.udf.builtin.BuiltinScalarFunction;
import org.apache.iotdb.commons.udf.builtin.BuiltinTimeSeriesGeneratingFunction;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.schematree.ISchemaTree;
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.expression.UnknownExpressionTypeException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java
index ba4bdf4255c..c35681a5487 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAggregationAnalyze.java
@@ -44,7 +44,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.ENDTIME;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ENDTIME;
import static org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeVisitor.DEVICE_EXPRESSION;
import static org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeVisitor.analyzeExpressionType;
import static org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeVisitor.analyzeGroupByTime;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/IQueryExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/IQueryExecution.java
index b35123e8f70..f7c99b85f29 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/IQueryExecution.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/IQueryExecution.java
@@ -67,4 +67,6 @@ public interface IQueryExecution {
Optional<String> getExecuteSQL();
String getStatementType();
+
+ String getSQLDialect();
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java
index 156705a7212..87a02f16131 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/QueryExecution.java
@@ -684,6 +684,11 @@ public class QueryExecution implements IQueryExecution {
return analysis.getStatementType();
}
+ @Override
+ public String getSQLDialect() {
+ return context.getSession().getSqlDialect().toString();
+ }
+
public MPPQueryContext getContext() {
return context;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java
index a698563c214..965ed7868bf 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java
@@ -297,4 +297,9 @@ public class ConfigExecution implements IQueryExecution {
public String getStatementType() {
return statementType == null ? null : statementType.name();
}
+
+ @Override
+ public String getSQLDialect() {
+ return context.getSession().getSqlDialect().toString();
+ }
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java
index 58efa1b5350..1fd3b186eea 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/TableConfigTaskVisitor.java
@@ -63,6 +63,7 @@ import org.apache.iotdb.db.queryengine.plan.execution.config.session.ShowCurrent
import org.apache.iotdb.db.queryengine.plan.execution.config.session.ShowCurrentUserTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.session.ShowVersionTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.FlushTask;
+import org.apache.iotdb.db.queryengine.plan.execution.config.sys.KillQueryTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.SetConfigurationTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe.AlterPipeTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe.CreatePipeTask;
@@ -100,6 +101,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropTable;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DropTopic;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Flush;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.KillQuery;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LongLiteral;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node;
@@ -130,6 +132,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowVersion;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StartPipe;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.StopPipe;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Use;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewrite;
import org.apache.iotdb.db.queryengine.plan.relational.type.TypeNotFoundException;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowClusterStatement;
import org.apache.iotdb.db.queryengine.plan.statement.metadata.ShowRegionStatement;
@@ -555,6 +558,7 @@ public class TableConfigTaskVisitor extends AstVisitor<IConfigTask, MPPQueryCont
new StatementAnalyzerFactory(metadata, null, accessControl),
Collections.emptyList(),
Collections.emptyMap(),
+ StatementRewrite.NOOP,
WarningCollector.NOOP)
.analyze(node);
return new DeleteDeviceTask(node, context.getQueryId().getId(), context.getSession());
@@ -807,4 +811,10 @@ public class TableConfigTaskVisitor extends AstVisitor<IConfigTask, MPPQueryCont
context.setQueryType(QueryType.READ);
return new ShowCurrentTimestampTask();
}
+
+ @Override
+ protected IConfigTask visitKillQuery(KillQuery node, MPPQueryContext context) {
+ context.setQueryType(QueryType.WRITE);
+ return new KillQueryTask(node);
+ }
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/CountDatabaseTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/CountDatabaseTask.java
index 507b8ea0cc5..cc856078afc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/CountDatabaseTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/CountDatabaseTask.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.commons.conf.IoTDBConstant;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/CountTimeSlotListTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/CountTimeSlotListTask.java
index acd4426473f..3b184b88349 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/CountTimeSlotListTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/CountTimeSlotListTask.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TCountTimeSlotListResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetRegionIdTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetRegionIdTask.java
index 50e7850e2f1..0f305bf6d4e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetRegionIdTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetRegionIdTask.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TGetRegionIdResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetSeriesSlotListTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetSeriesSlotListTask.java
index d2ca8ed3f0a..0908e928b01 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetSeriesSlotListTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetSeriesSlotListTask.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TGetSeriesSlotListResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetTimeSlotListTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetTimeSlotListTask.java
index 99f1810a759..7bdd850bd08 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetTimeSlotListTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/GetTimeSlotListTask.java
@@ -20,10 +20,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.TimePartitionUtils;
import org.apache.iotdb.confignode.rpc.thrift.TGetTimeSlotListResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowAINodesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowAINodesTask.java
index e0bdffff149..d331d35c7d7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowAINodesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowAINodesTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TAINodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowAINodesResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterDetailsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterDetailsTask.java
index f57c84fe3b9..17778269b7e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterDetailsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterDetailsTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TNodeVersionInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
@@ -41,9 +41,9 @@ import org.apache.tsfile.utils.Binary;
import java.util.List;
import java.util.stream.Collectors;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.NODE_TYPE_AI_NODE;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.NODE_TYPE_CONFIG_NODE;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.NODE_TYPE_DATA_NODE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.NODE_TYPE_AI_NODE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.NODE_TYPE_CONFIG_NODE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.NODE_TYPE_DATA_NODE;
public class ShowClusterDetailsTask implements IConfigTask {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterIdTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterIdTask.java
index 3171f0b04e7..c43aa7f03c5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterIdTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterIdTask.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterTask.java
index 960b088293c..8837864ab13 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowClusterTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TNodeVersionInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
@@ -41,9 +41,9 @@ import org.apache.tsfile.utils.Binary;
import java.util.List;
import java.util.stream.Collectors;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.NODE_TYPE_AI_NODE;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.NODE_TYPE_CONFIG_NODE;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.NODE_TYPE_DATA_NODE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.NODE_TYPE_AI_NODE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.NODE_TYPE_CONFIG_NODE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.NODE_TYPE_DATA_NODE;
public class ShowClusterTask implements IConfigTask {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowConfigNodesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowConfigNodesTask.java
index 2cf5ed17418..a666a72d815 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowConfigNodesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowConfigNodesTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowContinuousQueriesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowContinuousQueriesTask.java
index 5bac2140214..8a1140c3767 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowContinuousQueriesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowContinuousQueriesTask.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.commons.cq.CQState;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TCQEntry;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowDataNodesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowDataNodesTask.java
index 0c6b19238ca..1adb6e68cae 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowDataNodesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowDataNodesTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
index a0a8506d0b6..c6220151dd6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowFunctionsTask.java
@@ -20,14 +20,14 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.common.rpc.thrift.Model;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.udf.UDFInformation;
import org.apache.iotdb.commons.udf.UDFType;
import org.apache.iotdb.commons.udf.builtin.BuiltinAggregationFunction;
import org.apache.iotdb.commons.udf.builtin.BuiltinScalarFunction;
import org.apache.iotdb.commons.udf.builtin.BuiltinTimeSeriesGeneratingFunction;
import org.apache.iotdb.commons.udf.utils.TreeUDFUtils;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowPipePluginsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowPipePluginsTask.java
index ec33bcc3d66..fc2b47aa689 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowPipePluginsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowPipePluginsTask.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.commons.pipe.agent.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.commons.pipe.agent.plugin.meta.PipePluginMeta;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java
index 3578cc4b26f..4662c2ec3d4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowRegionTask.java
@@ -20,11 +20,11 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.iotdb.confignode.rpc.thrift.TRegionInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowTTLTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowTTLTask.java
index 74faaca4365..148394a1d9c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowTTLTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowTTLTask.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
import org.apache.iotdb.commons.conf.IoTDBConstant;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowTriggersTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowTriggersTask.java
index a39ace87fce..be6ebb86875 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowTriggersTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowTriggersTask.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.trigger.TriggerInformation;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowVariablesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowVariablesTask.java
index 10267fdf985..d4f8adf23a5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowVariablesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/ShowVariablesTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TClusterParameters;
import org.apache.iotdb.confignode.rpc.thrift.TShowVariablesResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/model/ShowModelsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/model/ShowModelsTask.java
index 0dc70f21e3e..83bafbccee3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/model/ShowModelsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/model/ShowModelsTask.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.model;
import org.apache.iotdb.commons.model.ModelType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DeleteDeviceTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DeleteDeviceTask.java
index c1dd2e58525..0ab31dda196 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DeleteDeviceTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DeleteDeviceTask.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableDetailsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableDetailsTask.java
index 48e8b50edb0..ad6220ffc1a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableDetailsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableDetailsTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableTask.java
index 27656274ab0..c1805442c25 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/DescribeTableTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowAINodesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowAINodesTask.java
index 20b88f8d1de..a074bae8680 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowAINodesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowAINodesTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowConfigNodesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowConfigNodesTask.java
index dfd2180daa2..f7d0b0240fa 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowConfigNodesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowConfigNodesTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java
index 976291dbdbc..8873e34272b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDBTask.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TDatabaseInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDataNodesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDataNodesTask.java
index c54e1a27571..60066d9bdd0 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDataNodesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowDataNodesTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeInfo;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowTablesDetailsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowTablesDetailsTask.java
index 1ecd87d4875..df7c9bb1277 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowTablesDetailsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowTablesDetailsTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.table.TableNodeStatus;
import org.apache.iotdb.confignode.rpc.thrift.TTableInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowTablesTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowTablesTask.java
index c549dd23054..c51677d08dd 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowTablesTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/relational/ShowTablesTask.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.relational;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TTableInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowNodesInSchemaTemplateTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowNodesInSchemaTemplateTask.java
index c6046d09832..2ab8fcbd1cb 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowNodesInSchemaTemplateTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowNodesInSchemaTemplateTask.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.template;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowPathSetTemplateTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowPathSetTemplateTask.java
index 5226cb59164..51094d7586c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowPathSetTemplateTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowPathSetTemplateTask.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.template;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowSchemaTemplateTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowSchemaTemplateTask.java
index 974e5ad3327..258efb6471c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowSchemaTemplateTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/metadata/template/ShowSchemaTemplateTask.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.metadata.template;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentDatabaseTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentDatabaseTask.java
index 20fd3ff1053..f7100593a0f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentDatabaseTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentDatabaseTask.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.session;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentSqlDialectTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentSqlDialectTask.java
index 26cac2b9cbd..ccfce5aed27 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentSqlDialectTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentSqlDialectTask.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.session;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentUserTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentUserTask.java
index ee8c23aa3e6..7408727c7c7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentUserTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/session/ShowCurrentUserTask.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.session;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/KillQueryTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/KillQueryTask.java
index 06dff0fdeac..9c4aa415d16 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/KillQueryTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/KillQueryTask.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.sys;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
import org.apache.iotdb.db.queryengine.plan.execution.config.executor.IConfigTaskExecutor;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.KillQuery;
import org.apache.iotdb.db.queryengine.plan.statement.sys.KillQueryStatement;
import com.google.common.util.concurrent.ListenableFuture;
@@ -34,6 +35,10 @@ public class KillQueryTask implements IConfigTask {
this.killQueryStatement = killQueryStatement;
}
+ public KillQueryTask(KillQuery killQuery) {
+ this.killQueryStatement = new KillQueryStatement(killQuery.getQueryId());
+ }
+
@Override
public ListenableFuture<ConfigTaskResult> execute(IConfigTaskExecutor configTaskExecutor)
throws InterruptedException {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/TestConnectionTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/TestConnectionTask.java
index ce37a7ad44c..483bb3ae1ff 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/TestConnectionTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/TestConnectionTask.java
@@ -25,9 +25,9 @@ import org.apache.iotdb.common.rpc.thrift.TServiceProvider;
import org.apache.iotdb.common.rpc.thrift.TServiceType;
import org.apache.iotdb.common.rpc.thrift.TTestConnectionResp;
import org.apache.iotdb.common.rpc.thrift.TTestConnectionResult;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.service.ThriftService;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/pipe/ShowPipeTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/pipe/ShowPipeTask.java
index e4075aa847c..6481d0713ac 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/pipe/ShowPipeTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/pipe/ShowPipeTask.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.sys.pipe;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeInfo;
import org.apache.iotdb.db.pipe.metric.PipeDataNodeRemainingEventAndTimeMetrics;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/quota/ShowSpaceQuotaTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/quota/ShowSpaceQuotaTask.java
index 16c0b6e2bdc..4aa59f0bed8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/quota/ShowSpaceQuotaTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/quota/ShowSpaceQuotaTask.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.plan.execution.config.sys.quota;
import org.apache.iotdb.common.rpc.thrift.TSpaceQuota;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.quotas.SpaceQuotaType;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TSpaceQuotaResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/quota/ShowThrottleQuotaTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/quota/ShowThrottleQuotaTask.java
index 0af594579ba..b1dd28c4f62 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/quota/ShowThrottleQuotaTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/quota/ShowThrottleQuotaTask.java
@@ -23,9 +23,9 @@ import org.apache.iotdb.common.rpc.thrift.TThrottleQuota;
import org.apache.iotdb.common.rpc.thrift.TTimedQuota;
import org.apache.iotdb.common.rpc.thrift.ThrottleType;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TThrottleQuotaResp;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/subscription/ShowSubscriptionsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/subscription/ShowSubscriptionsTask.java
index dc989b50f24..b421a25e3ce 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/subscription/ShowSubscriptionsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/subscription/ShowSubscriptionsTask.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TShowSubscriptionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/subscription/ShowTopicsTask.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/subscription/ShowTopicsTask.java
index 658ff5035e5..55578168d19 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/subscription/ShowTopicsTask.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/sys/subscription/ShowTopicsTask.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.queryengine.plan.execution.config.sys.subscription;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TShowTopicInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.execution.config.ConfigTaskResult;
import org.apache.iotdb.db.queryengine.plan.execution.config.IConfigTask;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/memory/StatementMemorySourceVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/memory/StatementMemorySourceVisitor.java
index d8391f68989..1abb74dc700 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/memory/StatementMemorySourceVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/memory/StatementMemorySourceVisitor.java
@@ -23,9 +23,9 @@ import org.apache.iotdb.common.rpc.thrift.TSchemaNode;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.node.MNodeType;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.planner.LogicalPlanner;
import org.apache.iotdb.db.queryengine.plan.planner.distribution.DistributionPlanner;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/memory/TableModelStatementMemorySourceVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/memory/TableModelStatementMemorySourceVisitor.java
index 46c77046096..4016bd3885d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/memory/TableModelStatementMemorySourceVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/memory/TableModelStatementMemorySourceVisitor.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.execution.memory;
import org.apache.iotdb.commons.conf.IoTDBConstant;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner;
@@ -91,7 +91,8 @@ public class TableModelStatementMemorySourceVisitor
symbolAllocator,
logicalPlan,
LocalExecutionPlanner.getInstance().metadata,
- Coordinator.getInstance().getDistributionPlanOptimizers())
+ Coordinator.getInstance().getDistributionPlanOptimizers(),
+ Coordinator.getInstance().getDataNodeLocationSupplier())
.generateDistributedPlanWithOptimize(planContext);
final List<String> lines =
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java
index 662e4b8f54d..13df1ff2c2b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/expression/visitor/BindTypeForTimeSeriesOperandVisitor.java
@@ -21,8 +21,8 @@ package org.apache.iotdb.db.queryengine.plan.expression.visitor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.exception.sql.SemanticException;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.expression.leaf.LeafOperand;
import org.apache.iotdb.db.queryengine.plan.expression.leaf.TimeSeriesOperand;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDown.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDown.java
index 0ed7fadf3c4..c2a08edaa5e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDown.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/optimization/AggregationPushDown.java
@@ -24,9 +24,9 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.AlignedPath;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.udf.builtin.BuiltinAggregationFunction;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.analyze.PredicateUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
index ea0351b1a2d..19325d90c8e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
@@ -30,6 +30,7 @@ import org.apache.iotdb.commons.cq.TimeoutPolicy;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.cache.CacheClearOptions;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.filter.SchemaFilterFactory;
import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
@@ -53,7 +54,6 @@ import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.IdentifierContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ProcessorAttributeClauseContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParser.ShowFunctionsContext;
import org.apache.iotdb.db.qp.sql.IoTDBSqlParserBaseVisitor;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.operator.window.WindowType;
import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.CountInferenceWindow;
import org.apache.iotdb.db.queryengine.execution.operator.window.ainode.HeadInferenceWindow;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
index 9916c4b3aa7..caa72292730 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanBuilder.java
@@ -27,11 +27,11 @@ import org.apache.iotdb.commons.path.AlignedPath;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.db.queryengine.common.DeviceContext;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.TimeseriesContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.execution.aggregation.AccumulatorFactory;
import org.apache.iotdb.db.queryengine.execution.operator.AggregationUtil;
@@ -127,8 +127,8 @@ import java.util.TreeMap;
import java.util.stream.Collectors;
import static org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.DEVICE;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.ENDTIME;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DEVICE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ENDTIME;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionTypeAnalyzer.analyzeExpression;
import static org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.TopKNode.LIMIT_VALUE_USE_TOP_K;
import static org.apache.iotdb.db.queryengine.plan.statement.component.FillPolicy.LINEAR;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
index fb6a9d6f041..f4de4085c29 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LogicalPlanVisitor.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.queryengine.plan.planner;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.analyze.Analysis;
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.expression.visitor.TransformToViewExpressionVisitor;
@@ -100,7 +100,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.ENDTIME;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ENDTIME;
/**
* This visitor is used to generate a logical plan for the statement and returns the {@link
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
index 1bc77836095..14fb41ebaa4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
@@ -21,9 +21,9 @@ package org.apache.iotdb.db.queryengine.plan.planner;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.path.AlignedFullPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.queryengine.common.FragmentInstanceId;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.ITableTimeRangeIterator;
import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableDateBinTimeRangeIterator;
import org.apache.iotdb.db.queryengine.execution.aggregation.timerangeiterator.TableSingleTimeWindowIterator;
@@ -71,6 +71,7 @@ import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DevicePr
import org.apache.iotdb.db.queryengine.execution.operator.schema.source.SchemaSourceFactory;
import org.apache.iotdb.db.queryengine.execution.operator.sink.IdentitySinkOperator;
import org.apache.iotdb.db.queryengine.execution.operator.source.ExchangeOperator;
+import org.apache.iotdb.db.queryengine.execution.operator.source.relational.InformationSchemaTableScanOperator;
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MergeSortFullOuterJoinOperator;
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.MergeSortInnerJoinOperator;
import org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableAggregationTableScanOperator;
@@ -111,11 +112,13 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode;
@@ -126,7 +129,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFill
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceFetchNode;
@@ -194,6 +196,7 @@ import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME;
import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode;
import static org.apache.iotdb.db.queryengine.execution.operator.process.join.merge.MergeSortComparator.getComparatorForTable;
+import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.InformationSchemaContentSupplierFactory.getSupplier;
import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.TIME_COLUMN_TEMPLATE;
import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.TableScanOperator.constructAlignedPath;
import static org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.AccumulatorFactory.createAccumulator;
@@ -316,7 +319,8 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution
}
@Override
- public Operator visitTableScan(TableScanNode node, LocalExecutionPlanContext context) {
+ public Operator visitDeviceTableScan(
+ DeviceTableScanNode node, LocalExecutionPlanContext context) {
List<Symbol> outputColumnNames = node.getOutputSymbols();
int outputColumnCount = outputColumnNames.size();
@@ -481,6 +485,28 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution
return scanOptionsBuilder;
}
+ @Override
+ public Operator visitInformationSchemaTableScan(
+ InformationSchemaTableScanNode node, LocalExecutionPlanContext context) {
+ OperatorContext operatorContext =
+ context
+ .getDriverContext()
+ .addOperatorContext(
+ context.getNextOperatorId(),
+ node.getPlanNodeId(),
+ InformationSchemaTableScanOperator.class.getSimpleName());
+
+ List<TSDataType> dataTypes =
+ node.getOutputSymbols().stream()
+ .map(symbol -> getTSDataType(context.getTypeProvider().getTableModelType(symbol)))
+ .collect(Collectors.toList());
+
+ return new InformationSchemaTableScanOperator(
+ operatorContext,
+ node.getPlanNodeId(),
+ getSupplier(node.getQualifiedObjectName().getObjectName(), dataTypes));
+ }
+
@Override
public Operator visitFilter(FilterNode node, LocalExecutionPlanContext context) {
TypeProvider typeProvider = context.getTypeProvider();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java
index 198e26e2f12..cd3cbe52c2f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlan.java
@@ -47,8 +47,8 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.DEVICE;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.ENDTIME;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DEVICE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.ENDTIME;
import static org.apache.iotdb.db.queryengine.plan.analyze.AnalyzeVisitor.END_TIME_EXPRESSION;
import static org.apache.iotdb.db.queryengine.plan.analyze.ExpressionAnalyzer.searchSourceExpressions;
import static org.apache.iotdb.db.queryengine.plan.analyze.TemplatedInfo.makeLayout;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlanBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlanBuilder.java
index e615a7600a9..19dcc8ee66d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlanBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TemplatedLogicalPlanBuilder.java
@@ -44,7 +44,7 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.DEVICE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DEVICE;
/**
* This class provides accelerated implementation for multiple devices align by device query. This
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java
index f85d17bad28..9286377576b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/PlanFragment.java
@@ -31,6 +31,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeri
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.AlignedSeriesScanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.VirtualSourceNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableModelTypeProviderExtractor;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.tsfile.utils.ReadWriteIOUtils;
@@ -39,6 +40,8 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Objects;
+import static com.google.common.base.Preconditions.checkArgument;
+
/** PlanFragment contains a sub-query of distributed query. */
public class PlanFragment {
// once you add field for this class you need to change the serialize and deserialize methods
@@ -130,6 +133,17 @@ public class PlanFragment {
private TDataNodeLocation getNodeLocation(PlanNode root) {
if (root instanceof VirtualSourceNode) {
return ((VirtualSourceNode) root).getDataNodeLocation();
+ } else if (root instanceof InformationSchemaTableScanNode) {
+ TRegionReplicaSet regionReplicaSet =
+ ((InformationSchemaTableScanNode) root).getRegionReplicaSet();
+
+ checkArgument(
+ regionReplicaSet != null, "InformationSchemaTableScanNode must have regionReplicaSet");
+ checkArgument(
+ regionReplicaSet.getDataNodeLocations().size() == 1,
+ "each InformationSchemaTableScanNode have only one DataNodeLocation");
+
+ return regionReplicaSet.getDataNodeLocations().get(0);
}
for (PlanNode child : root.getChildren()) {
TDataNodeLocation result = getNodeLocation(child);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/ExplainAnalyzeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/ExplainAnalyzeNode.java
index 4149ddf16f5..0d4efe1677b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/ExplainAnalyzeNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/ExplainAnalyzeNode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.process.SingleChildProcessNode;
import java.io.DataOutputStream;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
index 1939f6c6d75..48a339dcb0d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanGraphPrinter.java
@@ -65,6 +65,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.AggregationDe
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.CrossSeriesAggregationDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.DeviceViewIntoPathDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.IntoPathDescriptor;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode;
@@ -621,21 +622,38 @@ public class PlanGraphPrinter extends PlanVisitor<List<String>, PlanGraphPrinter
// =============== Methods below are used for table model ================
@Override
public List<String> visitTableScan(TableScanNode node, GraphContext context) {
+ DeviceTableScanNode deviceTableScanNode = null;
+ if (node instanceof DeviceTableScanNode) {
+ deviceTableScanNode = (DeviceTableScanNode) node;
+ }
+
List<String> boxValue = new ArrayList<>();
boxValue.add(String.format("TableScan-%s", node.getPlanNodeId().getId()));
boxValue.add(String.format("QualifiedTableName: %s", node.getQualifiedObjectName().toString()));
boxValue.add(String.format("OutputSymbols: %s", node.getOutputSymbols()));
- boxValue.add(String.format("DeviceNumber: %s", node.getDeviceEntries().size()));
- boxValue.add(String.format("ScanOrder: %s", node.getScanOrder()));
- if (node.getTimePredicate().isPresent()) {
- boxValue.add(String.format("TimePredicate: %s", node.getTimePredicate().get()));
+
+ if (deviceTableScanNode != null) {
+ boxValue.add(
+ String.format("DeviceNumber: %s", deviceTableScanNode.getDeviceEntries().size()));
+ boxValue.add(String.format("ScanOrder: %s", deviceTableScanNode.getScanOrder()));
+ if (deviceTableScanNode.getTimePredicate().isPresent()) {
+ boxValue.add(
+ String.format("TimePredicate: %s", deviceTableScanNode.getTimePredicate().get()));
+ }
}
+
if (node.getPushDownPredicate() != null) {
boxValue.add(String.format("PushDownPredicate: %s", node.getPushDownPredicate()));
}
boxValue.add(String.format("PushDownOffset: %s", node.getPushDownOffset()));
boxValue.add(String.format("PushDownLimit: %s", node.getPushDownLimit()));
- boxValue.add(String.format("PushDownLimitToEachDevice: %s", node.isPushLimitToEachDevice()));
+
+ if (deviceTableScanNode != null) {
+ boxValue.add(
+ String.format(
+ "PushDownLimitToEachDevice: %s", deviceTableScanNode.isPushLimitToEachDevice()));
+ }
+
boxValue.add(
String.format(
"RegionId: %s",
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java
index 3e53bc69690..dd67e129360 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanNodeType.java
@@ -118,6 +118,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalIn
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode;
@@ -259,7 +260,7 @@ public enum PlanNodeType {
DELETE_TABLE_DEVICES_IN_BLACK_LIST((short) 912),
TABLE_ATTRIBUTE_COLUMN_DROP((short) 913),
- TABLE_SCAN_NODE((short) 1000),
+ DEVICE_TABLE_SCAN_NODE((short) 1000),
TABLE_FILTER_NODE((short) 1001),
TABLE_PROJECT_NODE((short) 1002),
TABLE_OUTPUT_NODE((short) 1003),
@@ -280,6 +281,7 @@ public enum PlanNodeType {
TABLE_EXCHANGE_NODE((short) 1018),
TABLE_EXPLAIN_ANALYZE_NODE((short) 1019),
TABLE_ENFORCE_SINGLE_ROW_NODE((short) 1020),
+ INFORMATION_SCHEMA_TABLE_SCAN_NODE((short) 1021),
RELATIONAL_INSERT_TABLET((short) 2000),
RELATIONAL_INSERT_ROW((short) 2001),
@@ -581,7 +583,7 @@ public enum PlanNodeType {
case 913:
return TableAttributeColumnDropNode.deserialize(buffer);
case 1000:
- return org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode
+ return org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode
.deserialize(buffer);
case 1001:
return org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode.deserialize(
@@ -637,6 +639,9 @@ public enum PlanNodeType {
throw new UnsupportedOperationException("ExplainAnalyzeNode should not be deserialized");
case 1020:
return EnforceSingleRowNode.deserialize(buffer);
+ case 1021:
+ return InformationSchemaTableScanNode.deserialize(buffer);
+
case 2000:
return RelationalInsertTabletNode.deserialize(buffer);
case 2001:
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanVisitor.java
index 682f2a65202..9c172b53b1c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/PlanVisitor.java
@@ -121,7 +121,9 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalIn
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertRowsNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.RelationalInsertTabletNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupReference;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
@@ -663,6 +665,14 @@ public abstract class PlanVisitor<R, C> {
return visitPlan(node, context);
}
+ public R visitDeviceTableScan(DeviceTableScanNode node, C context) {
+ return visitTableScan(node, context);
+ }
+
+ public R visitInformationSchemaTableScan(InformationSchemaTableScanNode node, C context) {
+ return visitTableScan(node, context);
+ }
+
public R visitProject(
org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode node, C context) {
return visitSingleChildProcess(node, context);
@@ -758,6 +768,6 @@ public abstract class PlanVisitor<R, C> {
public R visitAggregationTableScan(
org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode node,
C context) {
- return visitTableScan(node, context);
+ return visitDeviceTableScan(node, context);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DevicesCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DevicesCountNode.java
index 8643c83ec1e..2bdce681e3f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DevicesCountNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DevicesCountNode.java
@@ -22,8 +22,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DevicesSchemaScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DevicesSchemaScanNode.java
index fb3819054bc..e7c5067c4e3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DevicesSchemaScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/DevicesSchemaScanNode.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/LevelTimeSeriesCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/LevelTimeSeriesCountNode.java
index ac69467b955..c267736b466 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/LevelTimeSeriesCountNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/LevelTimeSeriesCountNode.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/LogicalViewSchemaScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/LogicalViewSchemaScanNode.java
index ffdac83f9ba..78b8a26b664 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/LogicalViewSchemaScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/LogicalViewSchemaScanNode.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsSchemaScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsSchemaScanNode.java
index e7eeddcc9b1..04ce9356ea3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsSchemaScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/NodePathsSchemaScanNode.java
@@ -22,8 +22,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathDeserializeUtil;
import org.apache.iotdb.commons.path.PathPatternTree;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/PathsUsingTemplateScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/PathsUsingTemplateScanNode.java
index c661300b773..83627346a26 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/PathsUsingTemplateScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/PathsUsingTemplateScanNode.java
@@ -22,8 +22,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathDeserializeUtil;
import org.apache.iotdb.commons.path.PathPatternTree;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryOrderByHeatNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryOrderByHeatNode.java
index 61dfe2b0e47..295ddc2d0a8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryOrderByHeatNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/SchemaQueryOrderByHeatNode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TableDeviceSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TableDeviceSourceNode.java
index 46aa165ed5d..4891aa88825 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TableDeviceSourceNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TableDeviceSourceNode.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TimeSeriesCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TimeSeriesCountNode.java
index 5f06cffaa8f..4a935e4d0cc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TimeSeriesCountNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TimeSeriesCountNode.java
@@ -23,9 +23,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TimeSeriesSchemaScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TimeSeriesSchemaScanNode.java
index 4ac5c71bde2..0348234f34b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TimeSeriesSchemaScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/metadata/read/TimeSeriesSchemaScanNode.java
@@ -22,9 +22,9 @@ import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ActiveRegionScanMergeNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ActiveRegionScanMergeNode.java
index e75fd1ffbcb..13718e60437 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ActiveRegionScanMergeNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/ActiveRegionScanMergeNode.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java
index 0f81707bbea..dfb175da9a5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/AggregationNode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewIntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewIntoNode.java
index e24ebce3064..db0914d487f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewIntoNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/DeviceViewIntoNode.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/IntoNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/IntoNode.java
index d5ffbf7d246..d6f86d528c8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/IntoNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/IntoNode.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java
index dafcbdb9409..06198b1b347 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/RawDataAggregationNode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java
index cf4646c9c10..cffd814eedc 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/process/SlidingWindowAggregationNode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.process;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java
index a4db348342b..5d876fcfce2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/DeviceRegionScanNode.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathDeserializeUtil;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.DeviceContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java
index 8d4f8291a62..2663c6e0c9c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/LastQueryScanNode.java
@@ -22,7 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathDeserializeUtil;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.MemoryEstimationHelper;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
index 791122583f9..34bb3fe9955 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/SeriesAggregationSourceNode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowQueriesNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowQueriesNode.java
index 80a6e0326d3..92cec4c91e3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowQueriesNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/ShowQueriesNode.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.planner.plan.node.source;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java
index edc32d79017..5ab4fbc82d8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/source/TimeseriesRegionScanNode.java
@@ -24,10 +24,10 @@ import org.apache.iotdb.commons.path.AlignedPath;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathType;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.db.queryengine.common.TimeseriesContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analysis.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analysis.java
index b9214507821..e04e9473455 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analysis.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analysis.java
@@ -57,6 +57,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuantifiedCompari
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Query;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QuerySpecification;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowStatement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SubqueryExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Table;
@@ -102,6 +103,7 @@ import static java.util.Collections.unmodifiableMap;
import static java.util.Collections.unmodifiableSet;
import static java.util.Objects.requireNonNull;
import static org.apache.iotdb.commons.partition.DataPartition.NOT_ASSIGNED;
+import static org.apache.iotdb.commons.schema.table.InformationSchemaTable.QUERIES;
public class Analysis implements IAnalysis {
@@ -773,7 +775,8 @@ public class Analysis implements IAnalysis {
@Override
public boolean needSetHighestPriority() {
- return false;
+ return root instanceof ShowStatement
+ && ((ShowStatement) root).getTableName().equals(QUERIES.getSchemaTableName());
}
@Override
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analyzer.java
index 5ea7c492149..544c8c4643e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analyzer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/Analyzer.java
@@ -29,6 +29,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedInsertStatement;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewrite;
import java.util.List;
import java.util.Map;
@@ -47,6 +48,8 @@ public class Analyzer {
private final Map<NodeRef<Parameter>, Expression> parameterLookup;
+ private final StatementRewrite statementRewrite;
+
private final WarningCollector warningCollector;
public Analyzer(
@@ -55,6 +58,7 @@ public class Analyzer {
final StatementAnalyzerFactory statementAnalyzerFactory,
final List<Expression> parameters,
final Map<NodeRef<Parameter>, Expression> parameterLookup,
+ final StatementRewrite statementRewrite,
final WarningCollector warningCollector) {
this.context = context;
this.session = requireNonNull(session, "session is null");
@@ -62,15 +66,25 @@ public class Analyzer {
requireNonNull(statementAnalyzerFactory, "statementAnalyzerFactory is null");
this.parameters = parameters;
this.parameterLookup = parameterLookup;
+ this.statementRewrite = statementRewrite;
this.warningCollector = requireNonNull(warningCollector, "warningCollector is null");
}
public Analysis analyze(Statement statement) {
- Analysis analysis = new Analysis(statement, parameterLookup);
+ Statement rewrittenStatement =
+ statementRewrite.rewrite(
+ statementAnalyzerFactory,
+ session,
+ statement,
+ parameters,
+ parameterLookup,
+ warningCollector);
+
+ Analysis analysis = new Analysis(rewrittenStatement, parameterLookup);
Statement innerStatement =
- statement instanceof PipeEnriched
- ? ((PipeEnriched) statement).getInnerStatement()
- : statement;
+ rewrittenStatement instanceof PipeEnriched
+ ? ((PipeEnriched) rewrittenStatement).getInnerStatement()
+ : rewrittenStatement;
if (innerStatement instanceof WrappedInsertStatement) {
WrappedInsertStatement insertStatement = (WrappedInsertStatement) innerStatement;
if (insertStatement.getDatabase() != null) {
@@ -89,7 +103,7 @@ public class Analyzer {
statementAnalyzerFactory.createStatementAnalyzer(
analysis, context, session, warningCollector, CorrelationSupport.ALLOWED);
- analyzer.analyze(statement);
+ analyzer.analyze(rewrittenStatement);
if (analysis.isQuery()) {
long analyzeCost = System.nanoTime() - startTime;
QueryPlanCostMetricSet.getInstance().recordPlanCost(TABLE_TYPE, ANALYZER, analyzeCost);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java
index 9c18397dc59..4e1b6293825 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableMetadataImpl.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.db.queryengine.plan.relational.metadata;
import org.apache.iotdb.commons.partition.DataPartition;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.SchemaPartition;
+import org.apache.iotdb.commons.schema.table.InformationSchemaTable;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
@@ -61,9 +62,7 @@ import java.util.stream.Collectors;
import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_ROOT;
import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_SEPARATOR;
-import static org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType.EQUAL;
-import static org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType.LESS_THAN;
-import static org.apache.iotdb.db.queryengine.plan.relational.function.OperatorType.LESS_THAN_OR_EQUAL;
+import static org.apache.iotdb.commons.schema.table.InformationSchemaTable.INFORMATION_SCHEMA;
import static org.apache.tsfile.read.common.type.BinaryType.TEXT;
import static org.apache.tsfile.read.common.type.BooleanType.BOOLEAN;
import static org.apache.tsfile.read.common.type.DateType.DATE;
@@ -90,7 +89,14 @@ public class TableMetadataImpl implements Metadata {
@Override
public Optional<TableSchema> getTableSchema(SessionInfo session, QualifiedObjectName name) {
- TsTable table = tableCache.getTable(name.getDatabaseName(), name.getObjectName());
+ String databaseName = name.getDatabaseName();
+ String tableName = name.getObjectName();
+
+ // TODO Recover this line after put InformationSchema Table into cache
+ TsTable table =
+ databaseName.equals(INFORMATION_SCHEMA)
+ ? InformationSchemaTable.getTableFromStringValue(tableName)
+ : tableCache.getTable(databaseName, tableName);
if (table == null) {
return Optional.empty();
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java
index 48c00352929..e8cc70a0aa2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher;
import org.apache.iotdb.commons.exception.IoTDBException;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.filter.impl.singlechild.IdFilter;
import org.apache.iotdb.commons.schema.filter.impl.values.PreciseFilter;
@@ -31,7 +32,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.protocol.session.SessionManager;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult;
import org.apache.iotdb.db.queryengine.plan.planner.LocalExecutionPlanner;
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 914a47fe0ce..f77cc9f3f05 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
@@ -35,7 +35,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.TableMetadataImpl;
import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.IrUtils;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
@@ -86,6 +88,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import static java.util.Objects.requireNonNull;
+import static org.apache.iotdb.commons.schema.table.InformationSchemaTable.INFORMATION_SCHEMA;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.PlanBuilder.newPlanBuilder;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.coerce;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.QueryPlanner.coerceIfNecessary;
@@ -192,12 +195,15 @@ public class RelationPlanner extends AstVisitor<RelationPlan, Void> {
Map<Symbol, ColumnSchema> tableColumnSchema = symbolToColumnSchema.build();
analysis.addTableSchema(qualifiedObjectName, tableColumnSchema);
TableScanNode tableScanNode =
- new TableScanNode(
- idAllocator.genPlanNodeId(),
- qualifiedObjectName,
- outputSymbols,
- tableColumnSchema,
- idAndAttributeIndexMap);
+ qualifiedObjectName.getDatabaseName().equals(INFORMATION_SCHEMA)
+ ? new InformationSchemaTableScanNode(
+ idAllocator.genPlanNodeId(), qualifiedObjectName, outputSymbols, tableColumnSchema)
+ : new DeviceTableScanNode(
+ idAllocator.genPlanNodeId(),
+ qualifiedObjectName,
+ outputSymbols,
+ tableColumnSchema,
+ idAndAttributeIndexMap);
return new RelationPlan(tableScanNode, scope, outputSymbols, outerContext);
// Collection<Field> fields = analysis.getMaterializedViewStorageTableFields(node);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableLogicalPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableLogicalPlanner.java
index f42aa40386b..cf87061f1fa 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableLogicalPlanner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableLogicalPlanner.java
@@ -15,12 +15,12 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner;
import org.apache.iotdb.commons.partition.SchemaPartition;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.QueryId;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector;
import org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableModelPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableModelPlanner.java
index c8e0c948bc0..0af8a0eeae7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableModelPlanner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/TableModelPlanner.java
@@ -37,6 +37,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analyzer;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributedPlanner;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.DataNodeLocationSupplierFactory;
import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanOptimizer;
import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LoadTsFile;
@@ -44,6 +45,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.PipeEnriched;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.WrappedInsertStatement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewrite;
import org.apache.iotdb.db.queryengine.plan.scheduler.ClusterScheduler;
import org.apache.iotdb.db.queryengine.plan.scheduler.IScheduler;
import org.apache.iotdb.db.queryengine.plan.scheduler.load.LoadTsFileScheduler;
@@ -64,6 +66,7 @@ public class TableModelPlanner implements IPlanner {
private final SqlParser sqlParser;
private final Metadata metadata;
+ private final StatementRewrite statementRewrite;
private final List<PlanOptimizer> logicalPlanOptimizers;
private final List<PlanOptimizer> distributionPlanOptimizers;
private final SymbolAllocator symbolAllocator = new SymbolAllocator();
@@ -82,6 +85,8 @@ public class TableModelPlanner implements IPlanner {
private final IClientManager<TEndPoint, AsyncDataNodeInternalServiceClient>
asyncInternalServiceClientManager;
+ private final DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier;
+
public TableModelPlanner(
final Statement statement,
final SqlParser sqlParser,
@@ -93,9 +98,11 @@ public class TableModelPlanner implements IPlanner {
syncInternalServiceClientManager,
final IClientManager<TEndPoint, AsyncDataNodeInternalServiceClient>
asyncInternalServiceClientManager,
+ final StatementRewrite statementRewrite,
final List<PlanOptimizer> logicalPlanOptimizers,
final List<PlanOptimizer> distributionPlanOptimizers,
- final AccessControl accessControl) {
+ final AccessControl accessControl,
+ final DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier) {
this.statement = statement;
this.sqlParser = sqlParser;
this.metadata = metadata;
@@ -104,9 +111,11 @@ public class TableModelPlanner implements IPlanner {
this.scheduledExecutor = scheduledExecutor;
this.syncInternalServiceClientManager = syncInternalServiceClientManager;
this.asyncInternalServiceClientManager = asyncInternalServiceClientManager;
+ this.statementRewrite = statementRewrite;
this.logicalPlanOptimizers = logicalPlanOptimizers;
this.distributionPlanOptimizers = distributionPlanOptimizers;
this.accessControl = accessControl;
+ this.dataNodeLocationSupplier = dataNodeLocationSupplier;
}
@Override
@@ -117,6 +126,7 @@ public class TableModelPlanner implements IPlanner {
new StatementAnalyzerFactory(metadata, sqlParser, accessControl),
Collections.emptyList(),
Collections.emptyMap(),
+ statementRewrite,
warningCollector)
.analyze(statement);
}
@@ -137,7 +147,12 @@ public class TableModelPlanner implements IPlanner {
public DistributedQueryPlan doDistributionPlan(
final IAnalysis analysis, final LogicalQueryPlan logicalPlan) {
return new TableDistributedPlanner(
- (Analysis) analysis, symbolAllocator, logicalPlan, metadata, distributionPlanOptimizers)
+ (Analysis) analysis,
+ symbolAllocator,
+ logicalPlan,
+ metadata,
+ distributionPlanOptimizers,
+ dataNodeLocationSupplier)
.plan();
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
index b48abe29ef5..5c3eed2ad31 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
@@ -14,6 +14,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.distribute;
+import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.commons.partition.SchemaPartition;
@@ -36,11 +37,13 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode;
@@ -49,16 +52,17 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.AbstractTableDeviceQueryNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceFetchNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryCountNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceQueryScanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.DataNodeLocationSupplierFactory;
import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PushPredicateIntoTableScan;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
+import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.file.metadata.IDeviceID;
@@ -100,12 +104,17 @@ public class TableDistributedPlanGenerator
private final Analysis analysis;
private final SymbolAllocator symbolAllocator;
private final Map<PlanNodeId, OrderingScheme> nodeOrderingMap = new HashMap<>();
+ private final DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier;
public TableDistributedPlanGenerator(
- MPPQueryContext queryContext, Analysis analysis, SymbolAllocator symbolAllocator) {
+ MPPQueryContext queryContext,
+ Analysis analysis,
+ SymbolAllocator symbolAllocator,
+ DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier) {
this.queryId = queryContext.getQueryId();
this.analysis = analysis;
this.symbolAllocator = symbolAllocator;
+ this.dataNodeLocationSupplier = dataNodeLocationSupplier;
}
public List<PlanNode> genResult(PlanNode node, PlanContext context) {
@@ -443,8 +452,8 @@ public class TableDistributedPlanGenerator
}
@Override
- public List<PlanNode> visitTableScan(TableScanNode node, PlanContext context) {
- Map<TRegionReplicaSet, TableScanNode> tableScanNodeMap = new HashMap<>();
+ public List<PlanNode> visitDeviceTableScan(DeviceTableScanNode node, PlanContext context) {
+ Map<TRegionReplicaSet, DeviceTableScanNode> tableScanNodeMap = new HashMap<>();
for (DeviceEntry deviceEntry : node.getDeviceEntries()) {
List<TRegionReplicaSet> regionReplicaSets =
@@ -454,12 +463,12 @@ public class TableDistributedPlanGenerator
node.getTimeFilter());
for (TRegionReplicaSet regionReplicaSet : regionReplicaSets) {
- TableScanNode tableScanNode =
+ DeviceTableScanNode deviceTableScanNode =
tableScanNodeMap.computeIfAbsent(
regionReplicaSet,
k -> {
- TableScanNode scanNode =
- new TableScanNode(
+ DeviceTableScanNode scanNode =
+ new DeviceTableScanNode(
queryId.genPlanNodeId(),
node.getQualifiedObjectName(),
node.getOutputSymbols(),
@@ -475,7 +484,7 @@ public class TableDistributedPlanGenerator
scanNode.setRegionReplicaSet(regionReplicaSet);
return scanNode;
});
- tableScanNode.appendDeviceEntry(deviceEntry);
+ deviceTableScanNode.appendDeviceEntry(deviceEntry);
}
}
@@ -487,17 +496,17 @@ public class TableDistributedPlanGenerator
List<PlanNode> resultTableScanNodeList = new ArrayList<>();
TRegionReplicaSet mostUsedDataRegion = null;
int maxDeviceEntrySizeOfTableScan = 0;
- for (Map.Entry<TRegionReplicaSet, TableScanNode> entry : tableScanNodeMap.entrySet()) {
+ for (Map.Entry<TRegionReplicaSet, DeviceTableScanNode> entry : tableScanNodeMap.entrySet()) {
TRegionReplicaSet regionReplicaSet = entry.getKey();
- TableScanNode subTableScanNode = entry.getValue();
- subTableScanNode.setPlanNodeId(queryId.genPlanNodeId());
- subTableScanNode.setRegionReplicaSet(regionReplicaSet);
- resultTableScanNodeList.add(subTableScanNode);
+ DeviceTableScanNode subDeviceTableScanNode = entry.getValue();
+ subDeviceTableScanNode.setPlanNodeId(queryId.genPlanNodeId());
+ subDeviceTableScanNode.setRegionReplicaSet(regionReplicaSet);
+ resultTableScanNodeList.add(subDeviceTableScanNode);
if (mostUsedDataRegion == null
- || subTableScanNode.getDeviceEntries().size() > maxDeviceEntrySizeOfTableScan) {
+ || subDeviceTableScanNode.getDeviceEntries().size() > maxDeviceEntrySizeOfTableScan) {
mostUsedDataRegion = regionReplicaSet;
- maxDeviceEntrySizeOfTableScan = subTableScanNode.getDeviceEntries().size();
+ maxDeviceEntrySizeOfTableScan = subDeviceTableScanNode.getDeviceEntries().size();
}
}
context.mostUsedRegion = mostUsedDataRegion;
@@ -510,6 +519,30 @@ public class TableDistributedPlanGenerator
return resultTableScanNodeList;
}
+ @Override
+ public List<PlanNode> visitInformationSchemaTableScan(
+ InformationSchemaTableScanNode node, PlanContext context) {
+ List<TDataNodeLocation> dataNodeLocations =
+ dataNodeLocationSupplier.getDataNodeLocations(
+ node.getQualifiedObjectName().getObjectName());
+ checkArgument(!dataNodeLocations.isEmpty(), "DataNodeLocations shouldn't be empty");
+
+ List<PlanNode> resultTableScanNodeList = new ArrayList<>();
+ dataNodeLocations.forEach(
+ dataNodeLocation ->
+ resultTableScanNodeList.add(
+ new InformationSchemaTableScanNode(
+ queryId.genPlanNodeId(),
+ node.getQualifiedObjectName(),
+ node.getOutputSymbols(),
+ node.getAssignments(),
+ node.getPushDownPredicate(),
+ node.getPushDownLimit(),
+ node.getPushDownOffset(),
+ new TRegionReplicaSet(null, ImmutableList.of(dataNodeLocation)))));
+ return resultTableScanNodeList;
+ }
+
@Override
public List<PlanNode> visitAggregation(AggregationNode node, PlanContext context) {
if (node.isStreamable()) {
@@ -607,15 +640,15 @@ public class TableDistributedPlanGenerator
int maxDeviceEntrySizeOfTableScan = 0;
for (Map.Entry<TRegionReplicaSet, AggregationTableScanNode> entry : regionNodeMap.entrySet()) {
TRegionReplicaSet regionReplicaSet = entry.getKey();
- TableScanNode subTableScanNode = entry.getValue();
- subTableScanNode.setPlanNodeId(queryId.genPlanNodeId());
- subTableScanNode.setRegionReplicaSet(regionReplicaSet);
- resultTableScanNodeList.add(subTableScanNode);
+ DeviceTableScanNode subDeviceTableScanNode = entry.getValue();
+ subDeviceTableScanNode.setPlanNodeId(queryId.genPlanNodeId());
+ subDeviceTableScanNode.setRegionReplicaSet(regionReplicaSet);
+ resultTableScanNodeList.add(subDeviceTableScanNode);
if (mostUsedDataRegion == null
- || subTableScanNode.getDeviceEntries().size() > maxDeviceEntrySizeOfTableScan) {
+ || subDeviceTableScanNode.getDeviceEntries().size() > maxDeviceEntrySizeOfTableScan) {
mostUsedDataRegion = regionReplicaSet;
- maxDeviceEntrySizeOfTableScan = subTableScanNode.getDeviceEntries().size();
+ maxDeviceEntrySizeOfTableScan = subDeviceTableScanNode.getDeviceEntries().size();
}
}
context.mostUsedRegion = mostUsedDataRegion;
@@ -729,7 +762,7 @@ public class TableDistributedPlanGenerator
}
private void processSortProperty(
- final TableScanNode tableScanNode,
+ final DeviceTableScanNode deviceTableScanNode,
final List<PlanNode> resultTableScanNodeList,
final PlanContext context) {
final List<Symbol> newOrderingSymbols = new ArrayList<>();
@@ -738,17 +771,17 @@ public class TableDistributedPlanGenerator
boolean lastIsTimeRelated = false;
for (final Symbol symbol : expectedOrderingScheme.getOrderBy()) {
- if (timeRelatedSymbol(symbol, tableScanNode)) {
+ if (timeRelatedSymbol(symbol, deviceTableScanNode)) {
if (!expectedOrderingScheme.getOrderings().get(symbol).isAscending()) {
// TODO(beyyes) move scan order judgement into logical plan optimizer
resultTableScanNodeList.forEach(
- node -> ((TableScanNode) node).setScanOrder(Ordering.DESC));
+ node -> ((DeviceTableScanNode) node).setScanOrder(Ordering.DESC));
}
newOrderingSymbols.add(symbol);
newSortOrders.add(expectedOrderingScheme.getOrdering(symbol));
lastIsTimeRelated = true;
break;
- } else if (!tableScanNode.getIdAndAttributeIndexMap().containsKey(symbol)) {
+ } else if (!deviceTableScanNode.getIdAndAttributeIndexMap().containsKey(symbol)) {
break;
}
@@ -756,19 +789,19 @@ public class TableDistributedPlanGenerator
newSortOrders.add(expectedOrderingScheme.getOrdering(symbol));
}
- // no sort property can be pushed down into TableScanNode
+ // no sort property can be pushed down into DeviceTableScanNode
if (newOrderingSymbols.isEmpty()) {
return;
}
final List<Function<DeviceEntry, String>> orderingRules = new ArrayList<>();
for (final Symbol symbol : newOrderingSymbols) {
- final Integer idx = tableScanNode.getIdAndAttributeIndexMap().get(symbol);
+ final Integer idx = deviceTableScanNode.getIdAndAttributeIndexMap().get(symbol);
if (idx == null) {
// time column or date_bin column
break;
}
- if (tableScanNode.getAssignments().get(symbol).getColumnCategory()
+ if (deviceTableScanNode.getAssignments().get(symbol).getColumnCategory()
== TsTableColumnCategory.ID) {
// segments[0] is always tableName
orderingRules.add(deviceEntry -> (String) deviceEntry.getNthSegment(idx + 1));
@@ -828,13 +861,13 @@ public class TableDistributedPlanGenerator
final Optional<OrderingScheme> newOrderingScheme =
tableScanOrderingSchema(
- analysis.getTableColumnSchema(tableScanNode.getQualifiedObjectName()),
+ analysis.getTableColumnSchema(deviceTableScanNode.getQualifiedObjectName()),
newOrderingSymbols,
newSortOrders,
lastIsTimeRelated,
- tableScanNode.getDeviceEntries().size() == 1);
+ deviceTableScanNode.getDeviceEntries().size() == 1);
for (final PlanNode planNode : resultTableScanNodeList) {
- final TableScanNode scanNode = (TableScanNode) planNode;
+ final DeviceTableScanNode scanNode = (DeviceTableScanNode) planNode;
newOrderingScheme.ifPresent(
orderingScheme -> nodeOrderingMap.put(scanNode.getPlanNodeId(), orderingScheme));
if (comparator != null) {
@@ -883,8 +916,8 @@ public class TableDistributedPlanGenerator
}
// time column or push down date_bin function call in agg which should only have one such column
- private boolean timeRelatedSymbol(Symbol symbol, TableScanNode tableScanNode) {
- return tableScanNode.isTimeColumn(symbol)
+ private boolean timeRelatedSymbol(Symbol symbol, DeviceTableScanNode deviceTableScanNode) {
+ return deviceTableScanNode.isTimeColumn(symbol)
|| PUSH_DOWN_DATE_BIN_SYMBOL_NAME.equals(symbol.getName());
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanner.java
index d0455c5844b..ffa0a16031c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanner.java
@@ -34,6 +34,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.PlannerContext;
import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.DataNodeLocationSupplierFactory;
import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.DistributedOptimizeFactory;
import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanOptimizer;
import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager;
@@ -57,20 +58,23 @@ public class TableDistributedPlanner {
private final MPPQueryContext mppQueryContext;
private final List<PlanOptimizer> optimizers;
private final Metadata metadata;
+ private final DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier;
@TestOnly
public TableDistributedPlanner(
Analysis analysis,
SymbolAllocator symbolAllocator,
LogicalQueryPlan logicalQueryPlan,
- Metadata metadata) {
+ Metadata metadata,
+ DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier) {
this(
analysis,
symbolAllocator,
logicalQueryPlan,
metadata,
new DistributedOptimizeFactory(new PlannerContext(metadata, new InternalTypeManager()))
- .getPlanOptimizers());
+ .getPlanOptimizers(),
+ dataNodeLocationSupplier);
}
public TableDistributedPlanner(
@@ -78,13 +82,15 @@ public class TableDistributedPlanner {
SymbolAllocator symbolAllocator,
LogicalQueryPlan logicalQueryPlan,
Metadata metadata,
- List<PlanOptimizer> distributedOptimizers) {
+ List<PlanOptimizer> distributedOptimizers,
+ DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier) {
this.analysis = analysis;
this.symbolAllocator = requireNonNull(symbolAllocator, "symbolAllocator is null");
this.logicalQueryPlan = logicalQueryPlan;
this.mppQueryContext = logicalQueryPlan.getContext();
this.optimizers = distributedOptimizers;
this.metadata = metadata;
+ this.dataNodeLocationSupplier = dataNodeLocationSupplier;
}
public DistributedQueryPlan plan() {
@@ -114,7 +120,8 @@ public class TableDistributedPlanner {
// generate table model distributed plan
List<PlanNode> distributedPlanResult =
- new TableDistributedPlanGenerator(mppQueryContext, analysis, symbolAllocator)
+ new TableDistributedPlanGenerator(
+ mppQueryContext, analysis, symbolAllocator, dataNodeLocationSupplier)
.genResult(logicalQueryPlan.getRootNode(), planContext);
checkArgument(distributedPlanResult.size() == 1, "Root node must return only one");
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelQueryFragmentPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelQueryFragmentPlanner.java
index 41746bd11a2..7ae12938a96 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelQueryFragmentPlanner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableModelQueryFragmentPlanner.java
@@ -117,7 +117,7 @@ public class TableModelQueryFragmentPlanner {
if (regionReplicaSet == null || regionReplicaSet.getRegionId() == null) {
TDataNodeLocation dataNodeLocation = fragment.getTargetLocation();
if (dataNodeLocation != null) {
- // now only the case ShowQueries will enter here
+ // now only the case ShowStatement will enter here
fragmentInstance.setExecutorAndHost(new QueryExecutor(dataNodeLocation));
} else {
// no data region && no dataNodeLocation, we need to execute this FI on local
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EliminateLimitProjectWithTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EliminateLimitProjectWithTableScan.java
index 24448b53ed3..11d0f463c8b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EliminateLimitProjectWithTableScan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EliminateLimitProjectWithTableScan.java
@@ -14,6 +14,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule;
import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
@@ -51,8 +52,12 @@ public class EliminateLimitProjectWithTableScan implements Rule<LimitNode> {
ProjectNode projectNode = captures.get(PROJECT);
TableScanNode tableScanNode = captures.get(TABLE_SCAN_NODE);
- if (parent.getCount() == tableScanNode.getPushDownLimit()
- && !tableScanNode.isPushLimitToEachDevice()) {
+ if (tableScanNode instanceof DeviceTableScanNode
+ && ((DeviceTableScanNode) tableScanNode).isPushLimitToEachDevice()) {
+ return Rule.Result.empty();
+ }
+
+ if (parent.getCount() == tableScanNode.getPushDownLimit()) {
return Rule.Result.ofPlanNode(projectNode);
} else {
return Rule.Result.empty();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EliminateLimitWithTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EliminateLimitWithTableScan.java
index d0d806eacb3..094f2218a16 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EliminateLimitWithTableScan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/EliminateLimitWithTableScan.java
@@ -14,6 +14,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.rule;
import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.Rule;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.utils.matching.Capture;
@@ -40,8 +41,12 @@ public class EliminateLimitWithTableScan implements Rule<LimitNode> {
public Rule.Result apply(LimitNode parent, Captures captures, Rule.Context context) {
TableScanNode tableScanNode = captures.get(CHILD);
- if (parent.getCount() == tableScanNode.getPushDownLimit()
- && !tableScanNode.isPushLimitToEachDevice()) {
+ if (tableScanNode instanceof DeviceTableScanNode
+ && ((DeviceTableScanNode) tableScanNode).isPushLimitToEachDevice()) {
+ return Rule.Result.empty();
+ }
+
+ if (parent.getCount() == tableScanNode.getPushDownLimit()) {
return Rule.Result.ofPlanNode(tableScanNode);
} else {
return Rule.Result.empty();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableScanColumns.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableScanColumns.java
index 7275f977014..0db00c31e7a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableScanColumns.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/iterative/rule/PruneTableScanColumns.java
@@ -19,6 +19,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolsExtractor;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import java.util.ArrayList;
@@ -68,27 +70,44 @@ public class PruneTableScanColumns extends ProjectOffPushDownRule<TableScanNode>
.forEach(symbol -> newAssignments.put(symbol, node.getAssignments().get(symbol)));
}
- // add time entry if TimePredicate exists
- node.getTimePredicate()
- .ifPresent(
- timePredicate ->
- SymbolsExtractor.extractUnique(timePredicate)
- .forEach(
- symbol -> newAssignments.put(symbol, node.getAssignments().get(symbol))));
+ if (node instanceof DeviceTableScanNode) {
+ DeviceTableScanNode deviceTableScanNode = (DeviceTableScanNode) node;
+ // add time entry if TimePredicate exists
+ deviceTableScanNode
+ .getTimePredicate()
+ .ifPresent(
+ timePredicate ->
+ SymbolsExtractor.extractUnique(timePredicate)
+ .forEach(
+ symbol -> newAssignments.put(symbol, node.getAssignments().get(symbol))));
- return Optional.of(
- new TableScanNode(
- node.getPlanNodeId(),
- node.getQualifiedObjectName(),
- newOutputs,
- newAssignments,
- node.getDeviceEntries(),
- node.getIdAndAttributeIndexMap(),
- node.getScanOrder(),
- node.getTimePredicate().orElse(null),
- node.getPushDownPredicate(),
- node.getPushDownLimit(),
- node.getPushDownOffset(),
- node.isPushLimitToEachDevice()));
+ return Optional.of(
+ new DeviceTableScanNode(
+ deviceTableScanNode.getPlanNodeId(),
+ deviceTableScanNode.getQualifiedObjectName(),
+ newOutputs,
+ newAssignments,
+ deviceTableScanNode.getDeviceEntries(),
+ deviceTableScanNode.getIdAndAttributeIndexMap(),
+ deviceTableScanNode.getScanOrder(),
+ deviceTableScanNode.getTimePredicate().orElse(null),
+ deviceTableScanNode.getPushDownPredicate(),
+ deviceTableScanNode.getPushDownLimit(),
+ deviceTableScanNode.getPushDownOffset(),
+ deviceTableScanNode.isPushLimitToEachDevice()));
+ } else if (node instanceof InformationSchemaTableScanNode) {
+ return Optional.of(
+ new InformationSchemaTableScanNode(
+ node.getPlanNodeId(),
+ node.getQualifiedObjectName(),
+ newOutputs,
+ newAssignments,
+ node.getPushDownPredicate(),
+ node.getPushDownLimit(),
+ node.getPushDownOffset()));
+ } else {
+ throw new UnsupportedOperationException(
+ "Unknown TableScanNode type: " + node.getClass().getSimpleName());
+ }
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTableScanNode.java
index c1ffa2ead26..01d58362fb1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTableScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/AggregationTableScanNode.java
@@ -57,7 +57,7 @@ import static java.util.Objects.requireNonNull;
import static org.apache.iotdb.db.utils.constant.SqlConstant.COUNT;
import static org.apache.iotdb.db.utils.constant.SqlConstant.TABLE_TIME_COLUMN_NAME;
-public class AggregationTableScanNode extends TableScanNode {
+public class AggregationTableScanNode extends DeviceTableScanNode {
// if there is date_bin function of time, we should use this field to transform time input
private final Assignments projection;
@@ -254,7 +254,7 @@ public class AggregationTableScanNode extends TableScanNode {
PlanNodeId id,
AggregationNode aggregationNode,
ProjectNode projectNode,
- TableScanNode tableScanNode) {
+ DeviceTableScanNode tableScanNode) {
return new AggregationTableScanNode(
id,
tableScanNode.getQualifiedObjectName(),
@@ -280,7 +280,7 @@ public class AggregationTableScanNode extends TableScanNode {
PlanNodeId id,
AggregationNode aggregationNode,
ProjectNode projectNode,
- TableScanNode tableScanNode,
+ DeviceTableScanNode tableScanNode,
AggregationNode.Step step) {
return new AggregationTableScanNode(
id,
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java
similarity index 63%
copy from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
copy to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java
index 8054f94404f..340a2ca146b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/DeviceTableScanNode.java
@@ -14,23 +14,16 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.node;
-import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
-import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
-import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
-import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry;
-import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
-import com.google.common.collect.ImmutableList;
import org.apache.tsfile.read.filter.basic.Filter;
import org.apache.tsfile.utils.ReadWriteIOUtils;
@@ -43,23 +36,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Optional;
-import java.util.stream.Collectors;
-import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.MEASUREMENT;
-import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME;
-
-public class TableScanNode extends SourceNode {
-
- protected final QualifiedObjectName qualifiedObjectName;
- // Indicate the column this node need to output
- protected List<Symbol> outputSymbols;
- // Indicate the column this node need to fetch from StorageEngine,
- // the number of fetched columns may be more than output columns when there are predicates push
- // down.
- protected Map<Symbol, ColumnSchema> assignments;
+public class DeviceTableScanNode extends TableScanNode {
protected List<DeviceEntry> deviceEntries;
@@ -83,38 +62,24 @@ public class TableScanNode extends SourceNode {
protected Filter timeFilter;
- // push down predicate for current series, could be null if it doesn't exist
- @Nullable protected Expression pushDownPredicate;
-
- // push down limit for result set. The default value is -1, which means no limit
- protected long pushDownLimit;
-
- // push down offset for result set. The default value is 0
- protected long pushDownOffset;
-
- // pushLimitToEachDevice == true means that each device in TableScanNode need to return
+ // pushLimitToEachDevice == true means that each device in DeviceTableScanNode need to return
// `pushDownLimit` row number
- // pushLimitToEachDevice == false means that all devices in TableScanNode totally need to return
+ // pushLimitToEachDevice == false means that all devices in DeviceTableScanNode totally need to
+ // return
// `pushDownLimit` row number
protected boolean pushLimitToEachDevice = false;
- // The id of DataRegion where the node will run
- protected TRegionReplicaSet regionReplicaSet;
-
- public TableScanNode(
+ public DeviceTableScanNode(
PlanNodeId id,
QualifiedObjectName qualifiedObjectName,
List<Symbol> outputSymbols,
Map<Symbol, ColumnSchema> assignments,
Map<Symbol, Integer> idAndAttributeIndexMap) {
- super(id);
- this.qualifiedObjectName = qualifiedObjectName;
- this.outputSymbols = outputSymbols;
- this.assignments = assignments;
+ super(id, qualifiedObjectName, outputSymbols, assignments);
this.idAndAttributeIndexMap = idAndAttributeIndexMap;
}
- public TableScanNode(
+ public DeviceTableScanNode(
PlanNodeId id,
QualifiedObjectName qualifiedObjectName,
List<Symbol> outputSymbols,
@@ -127,36 +92,30 @@ public class TableScanNode extends SourceNode {
long pushDownLimit,
long pushDownOffset,
boolean pushLimitToEachDevice) {
- super(id);
- this.qualifiedObjectName = qualifiedObjectName;
- this.outputSymbols = outputSymbols;
- this.assignments = assignments;
+ super(
+ id,
+ qualifiedObjectName,
+ outputSymbols,
+ assignments,
+ pushDownPredicate,
+ pushDownLimit,
+ pushDownOffset);
this.deviceEntries = deviceEntries;
this.idAndAttributeIndexMap = idAndAttributeIndexMap;
this.scanOrder = scanOrder;
this.timePredicate = timePredicate;
this.pushDownPredicate = pushDownPredicate;
- this.pushDownLimit = pushDownLimit;
- this.pushDownOffset = pushDownOffset;
this.pushLimitToEachDevice = pushLimitToEachDevice;
}
@Override
public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
- return visitor.visitTableScan(this, context);
+ return visitor.visitDeviceTableScan(this, context);
}
@Override
- public List<PlanNode> getChildren() {
- return ImmutableList.of();
- }
-
- @Override
- public void addChild(PlanNode child) {}
-
- @Override
- public TableScanNode clone() {
- return new TableScanNode(
+ public DeviceTableScanNode clone() {
+ return new DeviceTableScanNode(
getPlanNodeId(),
qualifiedObjectName,
outputSymbols,
@@ -171,54 +130,9 @@ public class TableScanNode extends SourceNode {
pushLimitToEachDevice);
}
- @Override
- public int allowedChildCount() {
- return 0;
- }
-
- @Override
- public List<String> getOutputColumnNames() {
- return outputSymbols.stream().map(Symbol::getName).collect(Collectors.toList());
- }
-
- public List<Symbol> getIdColumnsInTableStore(Metadata metadata, SessionInfo session) {
- return Objects.requireNonNull(
- metadata.getTableSchema(session, qualifiedObjectName).orElse(null))
- .getColumns()
- .stream()
- .filter(columnSchema -> columnSchema.getColumnCategory() == TsTableColumnCategory.ID)
- .map(columnSchema -> Symbol.of(columnSchema.getName()))
- .collect(Collectors.toList());
- }
-
- public boolean isMeasurementOrTimeColumn(Symbol symbol) {
- ColumnSchema columnSchema = assignments.get(symbol);
- return columnSchema != null
- && (columnSchema.getColumnCategory() == MEASUREMENT
- || columnSchema.getColumnCategory() == TIME);
- }
-
- public boolean isTimeColumn(Symbol symbol) {
- return isTimeColumn(symbol, assignments);
- }
-
- public Optional<Symbol> getTimeColumn() {
- for (Map.Entry<Symbol, ColumnSchema> entry : assignments.entrySet()) {
- if (entry.getValue().getColumnCategory() == TIME) {
- return Optional.of(entry.getKey());
- }
- }
- return Optional.empty();
- }
-
- public static boolean isTimeColumn(Symbol symbol, Map<Symbol, ColumnSchema> columnSchemaMap) {
- ColumnSchema columnSchema = columnSchemaMap.get(symbol);
- return columnSchema != null && columnSchema.getColumnCategory() == TIME;
- }
-
@Override
protected void serializeAttributes(ByteBuffer byteBuffer) {
- PlanNodeType.TABLE_SCAN_NODE.serialize(byteBuffer);
+ PlanNodeType.DEVICE_TABLE_SCAN_NODE.serialize(byteBuffer);
if (qualifiedObjectName.getDatabaseName() != null) {
ReadWriteIOUtils.write(true, byteBuffer);
@@ -271,7 +185,7 @@ public class TableScanNode extends SourceNode {
@Override
protected void serializeAttributes(DataOutputStream stream) throws IOException {
- PlanNodeType.TABLE_SCAN_NODE.serialize(stream);
+ PlanNodeType.DEVICE_TABLE_SCAN_NODE.serialize(stream);
if (qualifiedObjectName.getDatabaseName() != null) {
ReadWriteIOUtils.write(true, stream);
ReadWriteIOUtils.write(qualifiedObjectName.getDatabaseName(), stream);
@@ -323,7 +237,7 @@ public class TableScanNode extends SourceNode {
ReadWriteIOUtils.write(pushLimitToEachDevice, stream);
}
- public static TableScanNode deserialize(ByteBuffer byteBuffer) {
+ public static DeviceTableScanNode deserialize(ByteBuffer byteBuffer) {
boolean hasDatabaseName = ReadWriteIOUtils.readBool(byteBuffer);
String databaseName = null;
if (hasDatabaseName) {
@@ -377,7 +291,7 @@ public class TableScanNode extends SourceNode {
PlanNodeId planNodeId = PlanNodeId.deserialize(byteBuffer);
- return new TableScanNode(
+ return new DeviceTableScanNode(
planNodeId,
qualifiedObjectName,
outputSymbols,
@@ -392,33 +306,6 @@ public class TableScanNode extends SourceNode {
pushLimitToEachDevice);
}
- @Override
- public List<Symbol> getOutputSymbols() {
- return outputSymbols;
- }
-
- @Override
- public void open() throws Exception {}
-
- @Override
- public void close() throws Exception {}
-
- public QualifiedObjectName getQualifiedObjectName() {
- return this.qualifiedObjectName;
- }
-
- public void setOutputSymbols(List<Symbol> outputSymbols) {
- this.outputSymbols = outputSymbols;
- }
-
- public void setAssignments(Map<Symbol, ColumnSchema> assignments) {
- this.assignments = assignments;
- }
-
- public Map<Symbol, ColumnSchema> getAssignments() {
- return this.assignments;
- }
-
public void setDeviceEntries(List<DeviceEntry> deviceEntries) {
this.deviceEntries = deviceEntries;
}
@@ -443,46 +330,14 @@ public class TableScanNode extends SourceNode {
this.deviceEntries.add(deviceEntry);
}
- public long getPushDownLimit() {
- return this.pushDownLimit;
- }
-
- public void setPushDownLimit(long pushDownLimit) {
- this.pushDownLimit = pushDownLimit;
- }
-
- public long getPushDownOffset() {
- return this.pushDownOffset;
- }
-
- public void setPushDownOffset(long pushDownOffset) {
- this.pushDownOffset = pushDownOffset;
- }
-
- public Expression getPushDownPredicate() {
- return this.pushDownPredicate;
- }
-
public void setPushLimitToEachDevice(boolean pushLimitToEachDevice) {
this.pushLimitToEachDevice = pushLimitToEachDevice;
}
- public void setPushDownPredicate(@Nullable Expression pushDownPredicate) {
- this.pushDownPredicate = pushDownPredicate;
- }
-
public boolean isPushLimitToEachDevice() {
return pushLimitToEachDevice;
}
- public TRegionReplicaSet getRegionReplicaSet() {
- return this.regionReplicaSet;
- }
-
- public void setRegionReplicaSet(TRegionReplicaSet regionReplicaSet) {
- this.regionReplicaSet = regionReplicaSet;
- }
-
public Optional<Expression> getTimePredicate() {
return Optional.ofNullable(timePredicate);
}
@@ -498,37 +353,4 @@ public class TableScanNode extends SourceNode {
public void setTimeFilter(Filter timeFilter) {
this.timeFilter = timeFilter;
}
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- if (!super.equals(o)) {
- return false;
- }
- TableScanNode that = (TableScanNode) o;
- return Objects.equals(qualifiedObjectName, that.qualifiedObjectName)
- && Objects.equals(outputSymbols, that.outputSymbols)
- && Objects.equals(regionReplicaSet, that.regionReplicaSet);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(super.hashCode(), qualifiedObjectName, outputSymbols, regionReplicaSet);
- }
-
- @Override
- public String toString() {
- return "TableScanNode-" + this.getPlanNodeId();
- }
-
- @Override
- public PlanNode replaceChildren(List<PlanNode> newChildren) {
- checkArgument(newChildren.isEmpty(), "newChildren is not empty");
- return this;
- }
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/InformationSchemaTableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/InformationSchemaTableScanNode.java
new file mode 100644
index 00000000000..09ff95001a6
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/InformationSchemaTableScanNode.java
@@ -0,0 +1,212 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.queryengine.plan.relational.planner.node;
+
+import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
+import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
+import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
+import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
+import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
+import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
+import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
+
+import org.apache.tsfile.utils.ReadWriteIOUtils;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class InformationSchemaTableScanNode extends TableScanNode {
+ public InformationSchemaTableScanNode(
+ PlanNodeId id,
+ QualifiedObjectName qualifiedObjectName,
+ List<Symbol> outputSymbols,
+ Map<Symbol, ColumnSchema> assignments) {
+ super(id, qualifiedObjectName, outputSymbols, assignments);
+ }
+
+ public InformationSchemaTableScanNode(
+ PlanNodeId id,
+ QualifiedObjectName qualifiedObjectName,
+ List<Symbol> outputSymbols,
+ Map<Symbol, ColumnSchema> assignments,
+ Expression pushDownPredicate,
+ long pushDownLimit,
+ long pushDownOffset) {
+ super(
+ id,
+ qualifiedObjectName,
+ outputSymbols,
+ assignments,
+ pushDownPredicate,
+ pushDownLimit,
+ pushDownOffset);
+ }
+
+ public InformationSchemaTableScanNode(
+ PlanNodeId id,
+ QualifiedObjectName qualifiedObjectName,
+ List<Symbol> outputSymbols,
+ Map<Symbol, ColumnSchema> assignments,
+ Expression pushDownPredicate,
+ long pushDownLimit,
+ long pushDownOffset,
+ TRegionReplicaSet regionReplicaSet) {
+ super(
+ id,
+ qualifiedObjectName,
+ outputSymbols,
+ assignments,
+ pushDownPredicate,
+ pushDownLimit,
+ pushDownOffset);
+ this.regionReplicaSet = regionReplicaSet;
+ }
+
+ @Override
+ public <R, C> R accept(PlanVisitor<R, C> visitor, C context) {
+ return visitor.visitInformationSchemaTableScan(this, context);
+ }
+
+ @Override
+ public PlanNode clone() {
+ return new InformationSchemaTableScanNode(
+ id,
+ qualifiedObjectName,
+ outputSymbols,
+ assignments,
+ pushDownPredicate,
+ pushDownLimit,
+ pushDownOffset,
+ regionReplicaSet);
+ }
+
+ @Override
+ protected void serializeAttributes(ByteBuffer byteBuffer) {
+ PlanNodeType.INFORMATION_SCHEMA_TABLE_SCAN_NODE.serialize(byteBuffer);
+
+ if (qualifiedObjectName.getDatabaseName() != null) {
+ ReadWriteIOUtils.write(true, byteBuffer);
+ ReadWriteIOUtils.write(qualifiedObjectName.getDatabaseName(), byteBuffer);
+ } else {
+ ReadWriteIOUtils.write(false, byteBuffer);
+ }
+ ReadWriteIOUtils.write(qualifiedObjectName.getObjectName(), byteBuffer);
+
+ ReadWriteIOUtils.write(outputSymbols.size(), byteBuffer);
+ outputSymbols.forEach(symbol -> ReadWriteIOUtils.write(symbol.getName(), byteBuffer));
+
+ ReadWriteIOUtils.write(assignments.size(), byteBuffer);
+ for (Map.Entry<Symbol, ColumnSchema> entry : assignments.entrySet()) {
+ Symbol.serialize(entry.getKey(), byteBuffer);
+ ColumnSchema.serialize(entry.getValue(), byteBuffer);
+ }
+
+ if (pushDownPredicate != null) {
+ ReadWriteIOUtils.write(true, byteBuffer);
+ Expression.serialize(pushDownPredicate, byteBuffer);
+ } else {
+ ReadWriteIOUtils.write(false, byteBuffer);
+ }
+
+ ReadWriteIOUtils.write(pushDownLimit, byteBuffer);
+ ReadWriteIOUtils.write(pushDownOffset, byteBuffer);
+ }
+
+ @Override
+ protected void serializeAttributes(DataOutputStream stream) throws IOException {
+ PlanNodeType.INFORMATION_SCHEMA_TABLE_SCAN_NODE.serialize(stream);
+ if (qualifiedObjectName.getDatabaseName() != null) {
+ ReadWriteIOUtils.write(true, stream);
+ ReadWriteIOUtils.write(qualifiedObjectName.getDatabaseName(), stream);
+ } else {
+ ReadWriteIOUtils.write(false, stream);
+ }
+ ReadWriteIOUtils.write(qualifiedObjectName.getObjectName(), stream);
+
+ ReadWriteIOUtils.write(outputSymbols.size(), stream);
+ for (Symbol symbol : outputSymbols) {
+ ReadWriteIOUtils.write(symbol.getName(), stream);
+ }
+
+ ReadWriteIOUtils.write(assignments.size(), stream);
+ for (Map.Entry<Symbol, ColumnSchema> entry : assignments.entrySet()) {
+ Symbol.serialize(entry.getKey(), stream);
+ ColumnSchema.serialize(entry.getValue(), stream);
+ }
+
+ if (pushDownPredicate != null) {
+ ReadWriteIOUtils.write(true, stream);
+ Expression.serialize(pushDownPredicate, stream);
+ } else {
+ ReadWriteIOUtils.write(false, stream);
+ }
+
+ ReadWriteIOUtils.write(pushDownLimit, stream);
+ ReadWriteIOUtils.write(pushDownOffset, stream);
+ }
+
+ public static InformationSchemaTableScanNode deserialize(ByteBuffer byteBuffer) {
+ boolean hasDatabaseName = ReadWriteIOUtils.readBool(byteBuffer);
+ String databaseName = null;
+ if (hasDatabaseName) {
+ databaseName = ReadWriteIOUtils.readString(byteBuffer);
+ }
+ String tableName = ReadWriteIOUtils.readString(byteBuffer);
+ QualifiedObjectName qualifiedObjectName = new QualifiedObjectName(databaseName, tableName);
+
+ int size = ReadWriteIOUtils.readInt(byteBuffer);
+ List<Symbol> outputSymbols = new ArrayList<>(size);
+ for (int i = 0; i < size; i++) {
+ outputSymbols.add(Symbol.deserialize(byteBuffer));
+ }
+
+ size = ReadWriteIOUtils.readInt(byteBuffer);
+ Map<Symbol, ColumnSchema> assignments = new HashMap<>(size);
+ for (int i = 0; i < size; i++) {
+ assignments.put(Symbol.deserialize(byteBuffer), ColumnSchema.deserialize(byteBuffer));
+ }
+
+ Expression pushDownPredicate = null;
+ boolean hasPushDownPredicate = ReadWriteIOUtils.readBool(byteBuffer);
+ if (hasPushDownPredicate) {
+ pushDownPredicate = Expression.deserialize(byteBuffer);
+ }
+
+ long pushDownLimit = ReadWriteIOUtils.readLong(byteBuffer);
+ long pushDownOffset = ReadWriteIOUtils.readLong(byteBuffer);
+
+ PlanNodeId planNodeId = PlanNodeId.deserialize(byteBuffer);
+
+ return new InformationSchemaTableScanNode(
+ planNodeId,
+ qualifiedObjectName,
+ outputSymbols,
+ assignments,
+ pushDownPredicate,
+ pushDownLimit,
+ pushDownOffset);
+ }
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
index 8054f94404f..9db9ee45709 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
@@ -19,28 +19,18 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
-import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.source.SourceNode;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
-import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
-import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
import com.google.common.collect.ImmutableList;
-import org.apache.tsfile.read.filter.basic.Filter;
-import org.apache.tsfile.utils.ReadWriteIOUtils;
import javax.annotation.Nullable;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -51,7 +41,7 @@ import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.MEASUREMENT;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME;
-public class TableScanNode extends SourceNode {
+public abstract class TableScanNode extends SourceNode {
protected final QualifiedObjectName qualifiedObjectName;
// Indicate the column this node need to output
@@ -61,28 +51,6 @@ public class TableScanNode extends SourceNode {
// down.
protected Map<Symbol, ColumnSchema> assignments;
- protected List<DeviceEntry> deviceEntries;
-
- // Indicates the respective index order of ID and Attribute columns in DeviceEntry.
- // For example, for DeviceEntry `table1.tag1.tag2.attribute1.attribute2.s1.s2`, the content of
- // `idAndAttributeIndexMap` will
- // be `tag1: 0, tag2: 1, attribute1: 0, attribute2: 1`.
- protected final Map<Symbol, Integer> idAndAttributeIndexMap;
-
- // The order to traverse the data.
- // Currently, we only support TIMESTAMP_ASC and TIMESTAMP_DESC here.
- // The default order is TIMESTAMP_ASC, which means "order by timestamp asc"
- protected Ordering scanOrder = Ordering.ASC;
-
- // extracted time filter expression in where clause
- // case 1: where s1 > 1 and time >= 0 and time <= 10, time predicate will be time >= 0 and time <=
- // 10, pushDownPredicate will be s1 > 1
- // case 2: where s1 > 1 or time < 10, time predicate will be null, pushDownPredicate will be s1 >
- // 1 or time < 10
- @Nullable protected Expression timePredicate;
-
- protected Filter timeFilter;
-
// push down predicate for current series, could be null if it doesn't exist
@Nullable protected Expression pushDownPredicate;
@@ -92,26 +60,19 @@ public class TableScanNode extends SourceNode {
// push down offset for result set. The default value is 0
protected long pushDownOffset;
- // pushLimitToEachDevice == true means that each device in TableScanNode need to return
- // `pushDownLimit` row number
- // pushLimitToEachDevice == false means that all devices in TableScanNode totally need to return
- // `pushDownLimit` row number
- protected boolean pushLimitToEachDevice = false;
-
// The id of DataRegion where the node will run
+ // For query of schemaInfo, we only need the list of DataNodeLocation
protected TRegionReplicaSet regionReplicaSet;
public TableScanNode(
PlanNodeId id,
QualifiedObjectName qualifiedObjectName,
List<Symbol> outputSymbols,
- Map<Symbol, ColumnSchema> assignments,
- Map<Symbol, Integer> idAndAttributeIndexMap) {
+ Map<Symbol, ColumnSchema> assignments) {
super(id);
this.qualifiedObjectName = qualifiedObjectName;
this.outputSymbols = outputSymbols;
this.assignments = assignments;
- this.idAndAttributeIndexMap = idAndAttributeIndexMap;
}
public TableScanNode(
@@ -119,26 +80,16 @@ public class TableScanNode extends SourceNode {
QualifiedObjectName qualifiedObjectName,
List<Symbol> outputSymbols,
Map<Symbol, ColumnSchema> assignments,
- List<DeviceEntry> deviceEntries,
- Map<Symbol, Integer> idAndAttributeIndexMap,
- Ordering scanOrder,
- Expression timePredicate,
Expression pushDownPredicate,
long pushDownLimit,
- long pushDownOffset,
- boolean pushLimitToEachDevice) {
+ long pushDownOffset) {
super(id);
this.qualifiedObjectName = qualifiedObjectName;
this.outputSymbols = outputSymbols;
this.assignments = assignments;
- this.deviceEntries = deviceEntries;
- this.idAndAttributeIndexMap = idAndAttributeIndexMap;
- this.scanOrder = scanOrder;
- this.timePredicate = timePredicate;
this.pushDownPredicate = pushDownPredicate;
this.pushDownLimit = pushDownLimit;
this.pushDownOffset = pushDownOffset;
- this.pushLimitToEachDevice = pushLimitToEachDevice;
}
@Override
@@ -154,23 +105,6 @@ public class TableScanNode extends SourceNode {
@Override
public void addChild(PlanNode child) {}
- @Override
- public TableScanNode clone() {
- return new TableScanNode(
- getPlanNodeId(),
- qualifiedObjectName,
- outputSymbols,
- assignments,
- deviceEntries,
- idAndAttributeIndexMap,
- scanOrder,
- timePredicate,
- pushDownPredicate,
- pushDownLimit,
- pushDownOffset,
- pushLimitToEachDevice);
- }
-
@Override
public int allowedChildCount() {
return 0;
@@ -216,182 +150,6 @@ public class TableScanNode extends SourceNode {
return columnSchema != null && columnSchema.getColumnCategory() == TIME;
}
- @Override
- protected void serializeAttributes(ByteBuffer byteBuffer) {
- PlanNodeType.TABLE_SCAN_NODE.serialize(byteBuffer);
-
- if (qualifiedObjectName.getDatabaseName() != null) {
- ReadWriteIOUtils.write(true, byteBuffer);
- ReadWriteIOUtils.write(qualifiedObjectName.getDatabaseName(), byteBuffer);
- } else {
- ReadWriteIOUtils.write(false, byteBuffer);
- }
- ReadWriteIOUtils.write(qualifiedObjectName.getObjectName(), byteBuffer);
-
- ReadWriteIOUtils.write(outputSymbols.size(), byteBuffer);
- outputSymbols.forEach(symbol -> ReadWriteIOUtils.write(symbol.getName(), byteBuffer));
-
- ReadWriteIOUtils.write(assignments.size(), byteBuffer);
- for (Map.Entry<Symbol, ColumnSchema> entry : assignments.entrySet()) {
- Symbol.serialize(entry.getKey(), byteBuffer);
- ColumnSchema.serialize(entry.getValue(), byteBuffer);
- }
-
- ReadWriteIOUtils.write(deviceEntries.size(), byteBuffer);
- for (DeviceEntry entry : deviceEntries) {
- entry.serialize(byteBuffer);
- }
-
- ReadWriteIOUtils.write(idAndAttributeIndexMap.size(), byteBuffer);
- for (Map.Entry<Symbol, Integer> entry : idAndAttributeIndexMap.entrySet()) {
- Symbol.serialize(entry.getKey(), byteBuffer);
- ReadWriteIOUtils.write(entry.getValue(), byteBuffer);
- }
-
- ReadWriteIOUtils.write(scanOrder.ordinal(), byteBuffer);
-
- if (timePredicate != null) {
- ReadWriteIOUtils.write(true, byteBuffer);
- Expression.serialize(timePredicate, byteBuffer);
- } else {
- ReadWriteIOUtils.write(false, byteBuffer);
- }
-
- if (pushDownPredicate != null) {
- ReadWriteIOUtils.write(true, byteBuffer);
- Expression.serialize(pushDownPredicate, byteBuffer);
- } else {
- ReadWriteIOUtils.write(false, byteBuffer);
- }
-
- ReadWriteIOUtils.write(pushDownLimit, byteBuffer);
- ReadWriteIOUtils.write(pushDownOffset, byteBuffer);
- ReadWriteIOUtils.write(pushLimitToEachDevice, byteBuffer);
- }
-
- @Override
- protected void serializeAttributes(DataOutputStream stream) throws IOException {
- PlanNodeType.TABLE_SCAN_NODE.serialize(stream);
- if (qualifiedObjectName.getDatabaseName() != null) {
- ReadWriteIOUtils.write(true, stream);
- ReadWriteIOUtils.write(qualifiedObjectName.getDatabaseName(), stream);
- } else {
- ReadWriteIOUtils.write(false, stream);
- }
- ReadWriteIOUtils.write(qualifiedObjectName.getObjectName(), stream);
-
- ReadWriteIOUtils.write(outputSymbols.size(), stream);
- for (Symbol symbol : outputSymbols) {
- ReadWriteIOUtils.write(symbol.getName(), stream);
- }
-
- ReadWriteIOUtils.write(assignments.size(), stream);
- for (Map.Entry<Symbol, ColumnSchema> entry : assignments.entrySet()) {
- Symbol.serialize(entry.getKey(), stream);
- ColumnSchema.serialize(entry.getValue(), stream);
- }
-
- ReadWriteIOUtils.write(deviceEntries.size(), stream);
- for (DeviceEntry entry : deviceEntries) {
- entry.serialize(stream);
- }
-
- ReadWriteIOUtils.write(idAndAttributeIndexMap.size(), stream);
- for (Map.Entry<Symbol, Integer> entry : idAndAttributeIndexMap.entrySet()) {
- Symbol.serialize(entry.getKey(), stream);
- ReadWriteIOUtils.write(entry.getValue(), stream);
- }
-
- ReadWriteIOUtils.write(scanOrder.ordinal(), stream);
-
- if (timePredicate != null) {
- ReadWriteIOUtils.write(true, stream);
- Expression.serialize(timePredicate, stream);
- } else {
- ReadWriteIOUtils.write(false, stream);
- }
-
- if (pushDownPredicate != null) {
- ReadWriteIOUtils.write(true, stream);
- Expression.serialize(pushDownPredicate, stream);
- } else {
- ReadWriteIOUtils.write(false, stream);
- }
-
- ReadWriteIOUtils.write(pushDownLimit, stream);
- ReadWriteIOUtils.write(pushDownOffset, stream);
- ReadWriteIOUtils.write(pushLimitToEachDevice, stream);
- }
-
- public static TableScanNode deserialize(ByteBuffer byteBuffer) {
- boolean hasDatabaseName = ReadWriteIOUtils.readBool(byteBuffer);
- String databaseName = null;
- if (hasDatabaseName) {
- databaseName = ReadWriteIOUtils.readString(byteBuffer);
- }
- String tableName = ReadWriteIOUtils.readString(byteBuffer);
- QualifiedObjectName qualifiedObjectName = new QualifiedObjectName(databaseName, tableName);
-
- int size = ReadWriteIOUtils.readInt(byteBuffer);
- List<Symbol> outputSymbols = new ArrayList<>(size);
- for (int i = 0; i < size; i++) {
- outputSymbols.add(Symbol.deserialize(byteBuffer));
- }
-
- size = ReadWriteIOUtils.readInt(byteBuffer);
- Map<Symbol, ColumnSchema> assignments = new HashMap<>(size);
- for (int i = 0; i < size; i++) {
- assignments.put(Symbol.deserialize(byteBuffer), ColumnSchema.deserialize(byteBuffer));
- }
-
- size = ReadWriteIOUtils.readInt(byteBuffer);
- List<DeviceEntry> deviceEntries = new ArrayList<>(size);
- while (size-- > 0) {
- deviceEntries.add(DeviceEntry.deserialize(byteBuffer));
- }
-
- size = ReadWriteIOUtils.readInt(byteBuffer);
- Map<Symbol, Integer> idAndAttributeIndexMap = new HashMap<>(size);
- while (size-- > 0) {
- idAndAttributeIndexMap.put(
- Symbol.deserialize(byteBuffer), ReadWriteIOUtils.readInt(byteBuffer));
- }
-
- Ordering scanOrder = Ordering.values()[ReadWriteIOUtils.readInt(byteBuffer)];
-
- Expression timePredicate = null;
- boolean hasTimePredicate = ReadWriteIOUtils.readBool(byteBuffer);
- if (hasTimePredicate) {
- timePredicate = Expression.deserialize(byteBuffer);
- }
-
- Expression pushDownPredicate = null;
- boolean hasPushDownPredicate = ReadWriteIOUtils.readBool(byteBuffer);
- if (hasPushDownPredicate) {
- pushDownPredicate = Expression.deserialize(byteBuffer);
- }
-
- long pushDownLimit = ReadWriteIOUtils.readLong(byteBuffer);
- long pushDownOffset = ReadWriteIOUtils.readLong(byteBuffer);
- boolean pushLimitToEachDevice = ReadWriteIOUtils.readBool(byteBuffer);
-
- PlanNodeId planNodeId = PlanNodeId.deserialize(byteBuffer);
-
- return new TableScanNode(
- planNodeId,
- qualifiedObjectName,
- outputSymbols,
- assignments,
- deviceEntries,
- idAndAttributeIndexMap,
- scanOrder,
- timePredicate,
- pushDownPredicate,
- pushDownLimit,
- pushDownOffset,
- pushLimitToEachDevice);
- }
-
@Override
public List<Symbol> getOutputSymbols() {
return outputSymbols;
@@ -419,30 +177,6 @@ public class TableScanNode extends SourceNode {
return this.assignments;
}
- public void setDeviceEntries(List<DeviceEntry> deviceEntries) {
- this.deviceEntries = deviceEntries;
- }
-
- public Map<Symbol, Integer> getIdAndAttributeIndexMap() {
- return this.idAndAttributeIndexMap;
- }
-
- public void setScanOrder(Ordering scanOrder) {
- this.scanOrder = scanOrder;
- }
-
- public Ordering getScanOrder() {
- return this.scanOrder;
- }
-
- public List<DeviceEntry> getDeviceEntries() {
- return deviceEntries;
- }
-
- public void appendDeviceEntry(DeviceEntry deviceEntry) {
- this.deviceEntries.add(deviceEntry);
- }
-
public long getPushDownLimit() {
return this.pushDownLimit;
}
@@ -463,18 +197,10 @@ public class TableScanNode extends SourceNode {
return this.pushDownPredicate;
}
- public void setPushLimitToEachDevice(boolean pushLimitToEachDevice) {
- this.pushLimitToEachDevice = pushLimitToEachDevice;
- }
-
public void setPushDownPredicate(@Nullable Expression pushDownPredicate) {
this.pushDownPredicate = pushDownPredicate;
}
- public boolean isPushLimitToEachDevice() {
- return pushLimitToEachDevice;
- }
-
public TRegionReplicaSet getRegionReplicaSet() {
return this.regionReplicaSet;
}
@@ -483,22 +209,6 @@ public class TableScanNode extends SourceNode {
this.regionReplicaSet = regionReplicaSet;
}
- public Optional<Expression> getTimePredicate() {
- return Optional.ofNullable(timePredicate);
- }
-
- public void setTimePredicate(@Nullable Expression timePredicate) {
- this.timePredicate = timePredicate;
- }
-
- public Filter getTimeFilter() {
- return timeFilter;
- }
-
- public void setTimeFilter(Filter timeFilter) {
- this.timeFilter = timeFilter;
- }
-
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDeviceQueryNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDeviceQueryNode.java
index 08f4a2a7f0f..8209b02e44c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDeviceQueryNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/AbstractTableDeviceQueryNode.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.metadata.read.TableDeviceSourceNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeUpdateNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeUpdateNode.java
index 8d193410928..3932db6a3ff 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeUpdateNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceAttributeUpdateNode.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceFetchNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceFetchNode.java
index 7a2a8f2dc7e..59c65782e4e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceFetchNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceFetchNode.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryCountNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryCountNode.java
index 07b4169c543..3e65e84a6c7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryCountNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryCountNode.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryScanNode.java
index cac6fe312bf..1aac183d90e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/schema/TableDeviceQueryScanNode.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/DataNodeLocationSupplierFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/DataNodeLocationSupplierFactory.java
new file mode 100644
index 00000000000..2d93e873cf0
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/DataNodeLocationSupplierFactory.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations;
+
+import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
+import org.apache.iotdb.commons.client.exception.ClientManagerException;
+import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
+import org.apache.iotdb.confignode.rpc.thrift.TGetDataNodeLocationsResp;
+import org.apache.iotdb.db.protocol.client.ConfigNodeClient;
+import org.apache.iotdb.db.protocol.client.ConfigNodeClientManager;
+import org.apache.iotdb.db.protocol.client.ConfigNodeInfo;
+import org.apache.iotdb.rpc.TSStatusCode;
+
+import org.apache.thrift.TException;
+
+import java.util.List;
+
+import static org.apache.iotdb.commons.schema.table.InformationSchemaTable.QUERIES;
+import static org.apache.iotdb.rpc.TSStatusCode.QUERY_PROCESS_ERROR;
+
+public class DataNodeLocationSupplierFactory {
+ private DataNodeLocationSupplierFactory() {}
+
+ public static DataNodeLocationSupplier getSupplier() {
+ return InformationSchemaTableDataNodeLocationSupplier.getInstance();
+ }
+
+ public interface DataNodeLocationSupplier {
+ List<TDataNodeLocation> getDataNodeLocations(String table);
+ }
+
+ private static class InformationSchemaTableDataNodeLocationSupplier
+ implements DataNodeLocationSupplier {
+ private InformationSchemaTableDataNodeLocationSupplier() {}
+
+ private static class SingletonHolder {
+ private static final InformationSchemaTableDataNodeLocationSupplier INSTANCE =
+ new InformationSchemaTableDataNodeLocationSupplier();
+ }
+
+ private static InformationSchemaTableDataNodeLocationSupplier getInstance() {
+ return SingletonHolder.INSTANCE;
+ }
+
+ private List<TDataNodeLocation> getRunningDataNodeLocations() {
+ try (ConfigNodeClient client =
+ ConfigNodeClientManager.getInstance().borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
+ TGetDataNodeLocationsResp showDataNodesResp = client.getRunningDataNodeLocations();
+ if (showDataNodesResp.getStatus().getCode()
+ != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
+ throw new IoTDBRuntimeException(
+ "An error occurred when executing getRunningDataNodeLocations():"
+ + showDataNodesResp.getStatus().getMessage(),
+ QUERY_PROCESS_ERROR.getStatusCode());
+ }
+ return showDataNodesResp.getDataNodeLocationList();
+ } catch (ClientManagerException | TException e) {
+ throw new IoTDBRuntimeException(
+ "An error occurred when executing getRunningDataNodeLocations():" + e.getMessage(),
+ QUERY_PROCESS_ERROR.getStatusCode());
+ }
+ }
+
+ @Override
+ public List<TDataNodeLocation> getDataNodeLocations(String tableName) {
+ if (tableName.equals(QUERIES.getSchemaTableName())) {
+ return getRunningDataNodeLocations();
+ } else {
+ throw new UnsupportedOperationException("Unknown table: " + tableName);
+ }
+ }
+ }
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushAggregationIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushAggregationIntoTableScan.java
index 8bdef50cdbe..7ac914e354c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushAggregationIntoTableScan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushAggregationIntoTableScan.java
@@ -23,8 +23,8 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SymbolReference;
@@ -44,7 +44,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizati
/**
* <b>Optimization phase:</b> Logical plan planning.
*
- * <p>The Aggregation may be pushed down to the TableScanNode, so that we can make use of
+ * <p>The Aggregation may be pushed down to the DeviceTableScanNode, so that we can make use of
* statistics.
*
* <p>Attention: This optimizer depends on {@link UnaliasSymbolReferences}.
@@ -82,19 +82,19 @@ public class PushAggregationIntoTableScan implements PlanOptimizer {
PlanNode child = node.getChild().accept(this, context);
node = (AggregationNode) node.clone();
node.setChild(child);
- TableScanNode tableScanNode = null;
+ DeviceTableScanNode tableScanNode = null;
ProjectNode projectNode = null;
- if (child instanceof TableScanNode) {
- tableScanNode = (TableScanNode) child;
+ if (child instanceof DeviceTableScanNode) {
+ tableScanNode = (DeviceTableScanNode) child;
}
if (child instanceof ProjectNode) {
projectNode = (ProjectNode) child;
- if (projectNode.getChild() instanceof TableScanNode) {
- tableScanNode = (TableScanNode) projectNode.getChild();
+ if (projectNode.getChild() instanceof DeviceTableScanNode) {
+ tableScanNode = (DeviceTableScanNode) projectNode.getChild();
}
}
- // only optimize AggregationNode with raw TableScanNode
+ // only optimize AggregationNode with raw DeviceTableScanNode
if (tableScanNode == null
|| tableScanNode instanceof AggregationTableScanNode) { // no need to optimize
return node;
@@ -129,7 +129,7 @@ public class PushAggregationIntoTableScan implements PlanOptimizer {
Collection<AggregationNode.Aggregation> values,
List<Symbol> groupingKeys,
ProjectNode projectNode,
- TableScanNode tableScanNode,
+ DeviceTableScanNode tableScanNode,
SessionInfo session,
Metadata metadata) {
boolean hasProject = projectNode != null;
@@ -193,7 +193,7 @@ public class PushAggregationIntoTableScan implements PlanOptimizer {
private boolean isDateBinFunctionOfTime(
Expression expression,
List<FunctionCall> dateBinFunctionsOfTime,
- TableScanNode tableScanNode) {
+ DeviceTableScanNode tableScanNode) {
if (expression instanceof FunctionCall) {
FunctionCall function = (FunctionCall) expression;
if (TableBuiltinScalarFunction.DATE_BIN
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java
index 3f8bb6371e6..0d9f562110d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java
@@ -22,8 +22,10 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode;
@@ -31,7 +33,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFill
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
@@ -44,7 +45,7 @@ import static org.apache.iotdb.db.queryengine.plan.relational.planner.optimizati
/**
* <b>Optimization phase:</b> Distributed plan planning.
*
- * <p>The LIMIT OFFSET condition can be pushed down to the TableScanNode, when the following
+ * <p>The LIMIT OFFSET condition can be pushed down to the DeviceTableScanNode, when the following
* conditions are met:
* <li>Time series query (not aggregation query).
* <li>The query expressions are all scalar expression.
@@ -96,9 +97,9 @@ public class PushLimitOffsetIntoTableScan implements PlanOptimizer {
// In Filter-TableScan and Filter-Project-TableScan case, limit can not be pushed down.
// In later, we need consider other case such as Filter-Values.
// FilterNode in outer query can not be pushed down.
- if (node.getChild() instanceof TableScanNode
+ if (node.getChild() instanceof DeviceTableScanNode
|| (node.getChild() instanceof ProjectNode
- && ((ProjectNode) node.getChild()).getChild() instanceof TableScanNode)) {
+ && ((ProjectNode) node.getChild()).getChild() instanceof DeviceTableScanNode)) {
context.enablePushDown = false;
return node;
}
@@ -153,10 +154,10 @@ public class PushLimitOffsetIntoTableScan implements PlanOptimizer {
context.enablePushDown = false;
return node;
} else {
- TableScanNode tableScanNode = subContext.tableScanNode;
- context.tableScanNode = tableScanNode;
- if (tableScanNode != null) {
- tableScanNode.setPushDownLimit(node.getCount());
+ DeviceTableScanNode deviceTableScanNode = subContext.deviceTableScanNode;
+ context.deviceTableScanNode = deviceTableScanNode;
+ if (deviceTableScanNode != null) {
+ deviceTableScanNode.setPushDownLimit(node.getCount());
}
return node;
}
@@ -174,14 +175,14 @@ public class PushLimitOffsetIntoTableScan implements PlanOptimizer {
return node;
}
- TableScanNode tableScanNode = subContext.tableScanNode;
- context.tableScanNode = tableScanNode;
+ DeviceTableScanNode deviceTableScanNode = subContext.deviceTableScanNode;
+ context.deviceTableScanNode = deviceTableScanNode;
OrderingScheme orderingScheme = node.getOrderingScheme();
Map<Symbol, ColumnSchema> tableColumnSchema =
- analysis.getTableColumnSchema(tableScanNode.getQualifiedObjectName());
+ analysis.getTableColumnSchema(deviceTableScanNode.getQualifiedObjectName());
Set<Symbol> sortSymbols = new HashSet<>();
for (Symbol orderBy : orderingScheme.getOrderBy()) {
- if (tableScanNode.isTimeColumn(orderBy)) {
+ if (deviceTableScanNode.isTimeColumn(orderBy)) {
break;
}
@@ -204,7 +205,7 @@ public class PushLimitOffsetIntoTableScan implements PlanOptimizer {
break;
}
}
- tableScanNode.setPushLimitToEachDevice(pushLimitToEachDevice);
+ deviceTableScanNode.setPushLimitToEachDevice(pushLimitToEachDevice);
return node;
}
@@ -220,8 +221,15 @@ public class PushLimitOffsetIntoTableScan implements PlanOptimizer {
}
@Override
- public PlanNode visitTableScan(TableScanNode node, Context context) {
- context.tableScanNode = node;
+ public PlanNode visitDeviceTableScan(DeviceTableScanNode node, Context context) {
+ context.deviceTableScanNode = node;
+ return node;
+ }
+
+ @Override
+ public PlanNode visitInformationSchemaTableScan(
+ InformationSchemaTableScanNode node, Context context) {
+ context.enablePushDown = false;
return node;
}
@@ -233,9 +241,9 @@ public class PushLimitOffsetIntoTableScan implements PlanOptimizer {
}
private static class Context {
- // means if limit and offset can be pushed down into TableScanNode
+ // means if limit and offset can be pushed down into DeviceTableScanNode
private boolean enablePushDown = true;
- private TableScanNode tableScanNode;
+ private DeviceTableScanNode deviceTableScanNode;
private boolean existSortNode = false;
private boolean existLimitNode = false;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java
index afff4e259a5..feeda5047eb 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java
@@ -46,11 +46,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.ReplaceSymbolInExpression;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ComparisonExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.FunctionCall;
@@ -106,15 +106,16 @@ import static org.apache.iotdb.db.queryengine.plan.relational.sql.ast.BooleanLit
* forms(CNF).
*
* <p>In this class, we examine each expression in CNFs, determine how to use it, in metadata query,
- * or pushed down into ScanOperators, or it can only be used in FilterNode above with TableScanNode.
+ * or pushed down into ScanOperators, or it can only be used in FilterNode above with
+ * DeviceTableScanNode.
*
* <ul>
* <li>For metadata query expressions, it will be used in {@code tableIndexScan} method to
- * generate the deviceEntries and DataPartition used for TableScanNode.
- * <li>For expressions which can be pushed into TableScanNode, we will execute {@code
+ * generate the deviceEntries and DataPartition used for DeviceTableScanNode.
+ * <li>For expressions which can be pushed into DeviceTableScanNode, we will execute {@code
* extractGlobalTimeFilter}, to extract the timePredicate and pushDownValuePredicate.
- * <li>Expression which can not be pushed down into TableScanNode, will be used in the FilterNode
- * above of TableScanNode.
+ * <li>Expression which can not be pushed down into DeviceTableScanNode, will be used in the
+ * FilterNode above of DeviceTableScanNode.
* </ul>
*
* <p>Notice that, when aggregation, multi-table, join are introduced, this optimization rule need
@@ -199,7 +200,7 @@ public class PushPredicateIntoTableScan implements PlanOptimizer {
Expression predicate = combineConjuncts(node.getPredicate(), context.inheritedPredicate);
- // when exist diff function, predicate can not be pushed down into TableScanNode
+ // when exist diff function, predicate can not be pushed down into DeviceTableScanNode
if (containsDiffFunction(predicate)) {
node.setChild(node.getChild().accept(this, new RewriteContext()));
node.setPredicate(predicate);
@@ -300,7 +301,8 @@ public class PushPredicateIntoTableScan implements PlanOptimizer {
}
@Override
- public PlanNode visitTableScan(TableScanNode tableScanNode, RewriteContext context) {
+ public PlanNode visitDeviceTableScan(
+ DeviceTableScanNode tableScanNode, RewriteContext context) {
// no predicate, just scan all matched deviceEntries
if (TRUE_LITERAL.equals(context.inheritedPredicate)) {
@@ -312,7 +314,7 @@ public class PushPredicateIntoTableScan implements PlanOptimizer {
return combineFilterAndScan(tableScanNode, context.inheritedPredicate);
}
- public PlanNode combineFilterAndScan(TableScanNode tableScanNode, Expression predicate) {
+ public PlanNode combineFilterAndScan(DeviceTableScanNode tableScanNode, Expression predicate) {
SplitExpression splitExpression = splitPredicate(tableScanNode, predicate);
// exist expressions can push down to scan operator
@@ -323,7 +325,7 @@ public class PushPredicateIntoTableScan implements PlanOptimizer {
? expressions.get(0)
: new LogicalExpression(LogicalExpression.Operator.AND, expressions);
- // extract global time filter and set it to TableScanNode
+ // extract global time filter and set it to DeviceTableScanNode
Pair<Expression, Boolean> resultPair =
extractGlobalTimeFilter(pushDownPredicate, splitExpression.getTimeColumnName());
if (resultPair.left != null) {
@@ -362,7 +364,7 @@ public class PushPredicateIntoTableScan implements PlanOptimizer {
return tableScanNode;
}
- private SplitExpression splitPredicate(TableScanNode node, Expression predicate) {
+ private SplitExpression splitPredicate(DeviceTableScanNode node, Expression predicate) {
Set<String> idOrAttributeColumnNames = new HashSet<>(node.getAssignments().size());
Set<String> measurementColumnNames = new HashSet<>(node.getAssignments().size());
String timeColumnName = null;
@@ -414,7 +416,9 @@ public class PushPredicateIntoTableScan implements PlanOptimizer {
}
private void getDeviceEntriesWithDataPartitions(
- TableScanNode tableScanNode, List<Expression> metadataExpressions, String timeColumnName) {
+ DeviceTableScanNode tableScanNode,
+ List<Expression> metadataExpressions,
+ String timeColumnName) {
List<String> attributeColumns = new ArrayList<>();
int attributeIndex = 0;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SortElimination.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SortElimination.java
index d1f249010d9..b785637bb1e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SortElimination.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/SortElimination.java
@@ -23,11 +23,11 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanVisitor;
import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode;
import java.util.Collections;
@@ -36,8 +36,8 @@ import java.util.Collections;
* <b>Optimization phase:</b> Distributed plan planning.
*
* <p>This optimize rule implement the rules below.
- * <li>When order by time and there is only one device entry in TableScanNode below, the SortNode
- * can be eliminated.
+ * <li>When order by time and there is only one device entry in DeviceTableScanNode below, the
+ * SortNode can be eliminated.
* <li>When order by all IDColumns and time, the SortNode can be eliminated.
* <li>When StreamSortIndex==OrderBy size()-1, remove this StreamSortNode
*/
@@ -92,7 +92,7 @@ public class SortElimination implements PlanOptimizer {
}
@Override
- public PlanNode visitTableScan(TableScanNode node, Context context) {
+ public PlanNode visitDeviceTableScan(DeviceTableScanNode node, Context context) {
context.addDeviceEntrySize(node.getDeviceEntries().size());
context.setTimeColumnName(node.getTimeColumn().map(Symbol::getName).orElse(null));
return node;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
index c57912ab4dc..845dc60c275 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
@@ -20,9 +20,9 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -117,7 +117,7 @@ public class TransformAggregationToStreamable implements PlanOptimizer {
}
@Override
- public List<Symbol> visitTableScan(TableScanNode node, GroupContext context) {
+ public List<Symbol> visitDeviceTableScan(DeviceTableScanNode node, GroupContext context) {
Set<Symbol> expectedGroupingKeys = context.groupingKeys;
Map<Symbol, ColumnSchema> assignments = node.getAssignments();
return expectedGroupingKeys.stream()
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformSortToStreamSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformSortToStreamSort.java
index 95f8004d8f8..cd5a5681e6b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformSortToStreamSort.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformSortToStreamSort.java
@@ -29,13 +29,14 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.OrderingScheme;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import java.util.Map;
-import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode.isTimeColumn;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode.isTimeColumn;
/**
* <b>Optimization phase:</b> Logical plan planning.
@@ -87,9 +88,9 @@ public class TransformSortToStreamSort implements PlanOptimizer {
}
context.setCanTransform(false);
- TableScanNode tableScanNode = context.getTableScanNode();
+ DeviceTableScanNode deviceTableScanNode = context.getTableScanNode();
Map<Symbol, ColumnSchema> tableColumnSchema =
- analysis.getTableColumnSchema(tableScanNode.getQualifiedObjectName());
+ analysis.getTableColumnSchema(deviceTableScanNode.getQualifiedObjectName());
OrderingScheme orderingScheme = node.getOrderingScheme();
int streamSortIndex = -1;
@@ -121,11 +122,18 @@ public class TransformSortToStreamSort implements PlanOptimizer {
}
@Override
- public PlanNode visitTableScan(TableScanNode node, Context context) {
+ public PlanNode visitDeviceTableScan(DeviceTableScanNode node, Context context) {
context.setTableScanNode(node);
return node;
}
+ @Override
+ public PlanNode visitInformationSchemaTableScan(
+ InformationSchemaTableScanNode node, Context context) {
+ context.setCanTransform(false);
+ return node;
+ }
+
@Override
public PlanNode visitAggregation(AggregationNode node, Context context) {
context.setCanTransform(false);
@@ -154,15 +162,15 @@ public class TransformSortToStreamSort implements PlanOptimizer {
}
private static class Context {
- private TableScanNode tableScanNode;
+ private DeviceTableScanNode tableScanNode;
private boolean canTransform = true;
- public TableScanNode getTableScanNode() {
+ public DeviceTableScanNode getTableScanNode() {
return tableScanNode;
}
- public void setTableScanNode(TableScanNode tableScanNode) {
+ public void setTableScanNode(DeviceTableScanNode tableScanNode) {
this.tableScanNode = tableScanNode;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/UnaliasSymbolReferences.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/UnaliasSymbolReferences.java
index aedd97bff6d..9ad678257d2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/UnaliasSymbolReferences.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/UnaliasSymbolReferences.java
@@ -26,10 +26,12 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.ir.DeterminismEva
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ApplyNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CorrelatedJoinNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExplainAnalyzeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.GapFillNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LinearFillNode;
@@ -38,7 +40,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.PreviousFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ValueFillNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
@@ -145,7 +146,7 @@ public class UnaliasSymbolReferences implements PlanOptimizer {
}
@Override
- public PlanAndMappings visitTableScan(TableScanNode node, UnaliasContext context) {
+ public PlanAndMappings visitDeviceTableScan(DeviceTableScanNode node, UnaliasContext context) {
Map<Symbol, Symbol> mapping = new HashMap<>(context.getCorrelationMapping());
SymbolMapper mapper = symbolMapper(mapping);
@@ -160,7 +161,7 @@ public class UnaliasSymbolReferences implements PlanOptimizer {
});
return new PlanAndMappings(
- new TableScanNode(
+ new DeviceTableScanNode(
node.getPlanNodeId(),
node.getQualifiedObjectName(),
newOutputs,
@@ -176,6 +177,34 @@ public class UnaliasSymbolReferences implements PlanOptimizer {
mapping);
}
+ @Override
+ public PlanAndMappings visitInformationSchemaTableScan(
+ InformationSchemaTableScanNode node, UnaliasContext context) {
+ Map<Symbol, Symbol> mapping = new HashMap<>(context.getCorrelationMapping());
+ SymbolMapper mapper = symbolMapper(mapping);
+
+ List<Symbol> newOutputs = mapper.map(node.getOutputSymbols());
+
+ Map<Symbol, ColumnSchema> newAssignments = new HashMap<>();
+ node.getAssignments()
+ .forEach(
+ (symbol, handle) -> {
+ Symbol newSymbol = mapper.map(symbol);
+ newAssignments.put(newSymbol, handle);
+ });
+
+ return new PlanAndMappings(
+ new InformationSchemaTableScanNode(
+ node.getPlanNodeId(),
+ node.getQualifiedObjectName(),
+ newOutputs,
+ newAssignments,
+ node.getPushDownPredicate(),
+ node.getPushDownLimit(),
+ node.getPushDownOffset()),
+ mapping);
+ }
+
@Override
public PlanAndMappings visitGapFill(GapFillNode node, UnaliasContext context) {
PlanAndMappings rewrittenSource = node.getChild().accept(this, context);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java
index 796f2aab5f6..2dbf3c7aded 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.queryengine.plan.relational.sql.ast;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractTraverseDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractTraverseDevice.java
index 2e50826f8e2..dea404dd92b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractTraverseDevice.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractTraverseDevice.java
@@ -19,11 +19,11 @@
package org.apache.iotdb.db.queryengine.plan.relational.sql.ast;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.MetadataUtil;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstVisitor.java
index 1a2e3b9f3a2..8cacc1375a1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AstVisitor.java
@@ -604,4 +604,12 @@ public abstract class AstVisitor<R, C> {
protected R visitShowCurrentTimestamp(ShowCurrentTimestamp node, C context) {
return visitStatement(node, context);
}
+
+ protected R visitShowStatement(ShowStatement node, C context) {
+ return visitStatement(node, context);
+ }
+
+ protected R visitKillQuery(KillQuery node, C context) {
+ return visitStatement(node, context);
+ }
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountDevice.java
index 7fee1005a36..7127ec55d6b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountDevice.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/CountDevice.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.sql.ast;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java
index caadbf31b75..79bf8147da3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/DeleteDevice.java
@@ -20,11 +20,11 @@
package org.apache.iotdb.db.queryengine.plan.relational.sql.ast;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilter;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor;
import org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource;
import org.apache.iotdb.db.queryengine.execution.relational.ColumnTransformerBuilder;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/KillQuery.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/KillQuery.java
new file mode 100644
index 00000000000..cbeebafebdd
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/KillQuery.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.queryengine.plan.relational.sql.ast;
+
+import com.google.common.collect.ImmutableList;
+
+import javax.annotation.Nullable;
+
+import java.util.List;
+import java.util.Objects;
+
+public class KillQuery extends Statement {
+ private final String queryId;
+
+ public KillQuery(String queryId, @Nullable NodeLocation location) {
+ super(location);
+ this.queryId = queryId;
+ }
+
+ public boolean isKillAll() {
+ return queryId == null;
+ }
+
+ public String getQueryId() {
+ return queryId;
+ }
+
+ @Override
+ public List<Node> getChildren() {
+ return ImmutableList.of();
+ }
+
+ @Override
+ public <R, C> R accept(AstVisitor<R, C> visitor, C context) {
+ return visitor.visitKillQuery(this, context);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ KillQuery killQuery = (KillQuery) o;
+ return Objects.equals(queryId, killQuery.queryId);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(queryId);
+ }
+
+ @Override
+ public boolean shallowEquals(Node other) {
+ return sameClass(this, other);
+ }
+
+ @Override
+ public String toString() {
+ return "KILL QUERY " + queryId;
+ }
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDevice.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDevice.java
index 7340c0f6c77..dbefd4b722a 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDevice.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowDevice.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.sql.ast;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.execution.operator.schema.source.TableDeviceQuerySource;
import org.apache.iotdb.db.queryengine.plan.relational.analyzer.Analysis;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowStatement.java
new file mode 100644
index 00000000000..d193bf1590d
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ShowStatement.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.queryengine.plan.relational.sql.ast;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static java.util.Objects.requireNonNull;
+
+public class ShowStatement extends Statement {
+ private final String tableName;
+
+ private final Optional<Expression> where;
+ private final Optional<OrderBy> orderBy;
+ private final Optional<Offset> offset;
+ private final Optional<Node> limit;
+
+ public ShowStatement(
+ NodeLocation location,
+ String tableName,
+ Optional<Expression> where,
+ Optional<OrderBy> orderBy,
+ Optional<Offset> offset,
+ Optional<Node> limit) {
+ super(requireNonNull(location, "location is null"));
+ this.tableName = tableName;
+ this.where = where;
+ this.orderBy = orderBy;
+ this.offset = offset;
+ this.limit = limit;
+ }
+
+ public String getTableName() {
+ return tableName;
+ }
+
+ public Optional<Expression> getWhere() {
+ return where;
+ }
+
+ public Optional<OrderBy> getOrderBy() {
+ return orderBy;
+ }
+
+ public Optional<Offset> getOffset() {
+ return offset;
+ }
+
+ public Optional<Node> getLimit() {
+ return limit;
+ }
+
+ @Override
+ public <R, C> R accept(AstVisitor<R, C> visitor, C context) {
+ return visitor.visitShowStatement(this, context);
+ }
+
+ @Override
+ public List<Node> getChildren() {
+ return ImmutableList.of();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ ShowStatement that = (ShowStatement) o;
+ return Objects.equals(tableName, that.tableName)
+ && Objects.equals(where, that.where)
+ && Objects.equals(orderBy, that.orderBy)
+ && Objects.equals(offset, that.offset)
+ && Objects.equals(limit, that.limit);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(tableName, where, orderBy, offset, limit);
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(this)
+ .add("tableName", tableName)
+ .add("where", where.orElse(null))
+ .add("orderBy", orderBy)
+ .add("offset", offset.orElse(null))
+ .add("limit", limit.orElse(null))
+ .omitNullValues()
+ .toString();
+ }
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
index eb81b2a900c..ef6036f827b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
@@ -95,6 +95,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Join;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinCriteria;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinOn;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.JoinUsing;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.KillQuery;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LikePredicate;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Limit;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Literal;
@@ -141,6 +142,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowIndex;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowPipePlugins;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowPipes;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowRegions;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowStatement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowSubscriptions;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTables;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowTopics;
@@ -217,6 +219,7 @@ import java.util.function.Function;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
+import static org.apache.iotdb.commons.schema.table.InformationSchemaTable.QUERIES;
import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ID;
@@ -1181,12 +1184,40 @@ public class AstBuilder extends RelationalSqlBaseVisitor<Node> {
@Override
public Node visitShowQueriesStatement(RelationalSqlParser.ShowQueriesStatementContext ctx) {
- return super.visitShowQueriesStatement(ctx);
+ Optional<OrderBy> orderBy = Optional.empty();
+ if (ctx.ORDER() != null) {
+ orderBy =
+ Optional.of(new OrderBy(getLocation(ctx.ORDER()), visit(ctx.sortItem(), SortItem.class)));
+ }
+
+ Optional<Offset> offset = Optional.empty();
+ if (ctx.limitOffsetClause().OFFSET() != null) {
+ offset = visitIfPresent(ctx.limitOffsetClause().offset, Offset.class);
+ }
+
+ Optional<Node> limit = Optional.empty();
+ if (ctx.limitOffsetClause().LIMIT() != null) {
+ if (ctx.limitOffsetClause().limit == null) {
+ throw new IllegalStateException("Missing LIMIT value");
+ }
+ limit = visitIfPresent(ctx.limitOffsetClause().limit, Node.class);
+ }
+
+ return new ShowStatement(
+ getLocation(ctx),
+ QUERIES.getSchemaTableName(),
+ visitIfPresent(ctx.where, Expression.class),
+ orderBy,
+ offset,
+ limit);
}
@Override
public Node visitKillQueryStatement(RelationalSqlParser.KillQueryStatementContext ctx) {
- return super.visitKillQueryStatement(ctx);
+ if (ctx.queryId == null) {
+ return new KillQuery(null, getLocation(ctx));
+ }
+ return new KillQuery(((StringLiteral) visit(ctx.queryId)).getValue(), getLocation(ctx));
}
@Override
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/ShowRewrite.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/ShowRewrite.java
new file mode 100644
index 00000000000..49a62721f93
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/ShowRewrite.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite;
+
+import org.apache.iotdb.db.queryengine.common.SessionInfo;
+import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector;
+import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef;
+import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory;
+import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AllColumns;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.AstVisitor;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Node;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.QualifiedName;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Relation;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.ShowStatement;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static java.util.Objects.requireNonNull;
+import static org.apache.iotdb.commons.schema.table.InformationSchemaTable.INFORMATION_SCHEMA;
+import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.QueryUtil.selectList;
+import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.QueryUtil.simpleQuery;
+import static org.apache.iotdb.db.queryengine.plan.relational.sql.util.QueryUtil.table;
+
+public final class ShowRewrite implements StatementRewrite.Rewrite {
+ private final Metadata metadata;
+
+ // private final SqlParser parser;
+ // private final AccessControl accessControl;
+
+ public ShowRewrite(Metadata metadata) {
+ this.metadata = requireNonNull(metadata, "metadata is null");
+ // this.parser = requireNonNull(parser, "parser is null");
+ // this.accessControl = requireNonNull(accessControl, "accessControl is null");
+ }
+
+ @Override
+ public Statement rewrite(
+ StatementAnalyzerFactory analyzerFactory,
+ SessionInfo session,
+ Statement node,
+ List<Expression> parameters,
+ Map<NodeRef<Parameter>, Expression> parameterLookup,
+ WarningCollector warningCollector) {
+ Visitor visitor = new Visitor(metadata, session);
+ return (Statement) visitor.process(node, null);
+ }
+
+ private static class Visitor extends AstVisitor<Node, Void> {
+ private final Metadata metadata;
+ private final SessionInfo session;
+
+ public Visitor(Metadata metadata, SessionInfo session) {
+ this.metadata = requireNonNull(metadata, "metadata is null");
+ this.session = requireNonNull(session, "session is null");
+ }
+
+ @Override
+ protected Node visitShowStatement(ShowStatement showStatement, Void context) {
+ // CatalogSchemaName schema = createCatalogSchemaName(session, showQueries,
+ // showQueries.getSchema());
+
+ // accessControl.checkCanShowQueries(session.toSecurityContext(), schema);
+
+ return simpleQuery(
+ selectList(new AllColumns()),
+ from(INFORMATION_SCHEMA, showStatement.getTableName()),
+ showStatement.getWhere(),
+ Optional.empty(),
+ Optional.empty(),
+ Optional.empty(),
+ showStatement.getOrderBy(),
+ showStatement.getOffset(),
+ showStatement.getLimit());
+ }
+
+ private static Relation from(String db, String table) {
+ return table(QualifiedName.of(db, table));
+ }
+
+ @Override
+ protected Node visitNode(Node node, Void context) {
+ return node;
+ }
+ }
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/StatementRewrite.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/StatementRewrite.java
new file mode 100644
index 00000000000..2173b6c0c0a
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/StatementRewrite.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite;
+
+import org.apache.iotdb.db.queryengine.common.SessionInfo;
+import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector;
+import org.apache.iotdb.db.queryengine.plan.relational.analyzer.NodeRef;
+import org.apache.iotdb.db.queryengine.plan.relational.analyzer.StatementAnalyzerFactory;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Parameter;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
+
+import com.google.common.collect.ImmutableSet;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static java.util.Objects.requireNonNull;
+
+public final class StatementRewrite {
+ private final Set<Rewrite> rewrites;
+
+ public StatementRewrite(Set<Rewrite> rewrites) {
+ this.rewrites = ImmutableSet.copyOf(requireNonNull(rewrites, "rewrites is null"));
+ }
+
+ public Statement rewrite(
+ StatementAnalyzerFactory analyzerFactory,
+ SessionInfo session,
+ Statement node,
+ List<Expression> parameters,
+ Map<NodeRef<Parameter>, Expression> parameterLookup,
+ WarningCollector warningCollector) {
+ for (Rewrite rewrite : rewrites) {
+ node =
+ requireNonNull(
+ rewrite.rewrite(
+ analyzerFactory, session, node, parameters, parameterLookup, warningCollector),
+ "Statement rewrite returned null");
+ }
+ return node;
+ }
+
+ public interface Rewrite {
+ Statement rewrite(
+ StatementAnalyzerFactory analyzerFactory,
+ SessionInfo session,
+ Statement node,
+ List<Expression> parameters,
+ Map<NodeRef<Parameter>, Expression> parameterLookup,
+ WarningCollector warningCollector);
+ }
+
+ public static final StatementRewrite NOOP = new StatementRewrite(ImmutableSet.of());
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/StatementRewriteFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/StatementRewriteFactory.java
new file mode 100644
index 00000000000..ca3e850ff27
--- /dev/null
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/rewrite/StatementRewriteFactory.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite;
+
+import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
+
+import com.google.common.collect.ImmutableSet;
+
+public class StatementRewriteFactory {
+ private final StatementRewrite statementRewrite;
+
+ public StatementRewriteFactory(Metadata metadata) {
+ this.statementRewrite = new StatementRewrite(ImmutableSet.of(new ShowRewrite(metadata)));
+ }
+
+ public StatementRewrite getStatementRewrite() {
+ return statementRewrite;
+ }
+}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java
index 4a50bb0e1fc..7c30cd29836 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/metadata/ShowDatabaseStatement.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.plan.statement.metadata;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.confignode.rpc.thrift.TDatabaseInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeaderFactory;
import org.apache.iotdb.db.queryengine.plan.analyze.QueryType;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
index 009f81d35f0..67ce3812466 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
@@ -28,6 +28,7 @@ import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.commons.schema.SchemaConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.SchemaFilterType;
import org.apache.iotdb.commons.schema.node.role.IMeasurementMNode;
import org.apache.iotdb.commons.schema.view.LogicalViewSchema;
@@ -41,7 +42,6 @@ import org.apache.iotdb.db.exception.metadata.SchemaDirCreationFailureException;
import org.apache.iotdb.db.exception.metadata.SchemaQuotaExceededException;
import org.apache.iotdb.db.exception.metadata.SeriesOverflowException;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree;
import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceAttributeUpdater;
import org.apache.iotdb.db.queryengine.execution.operator.schema.source.DeviceBlackListConstructor;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/columngenerator/parameter/SlidingTimeColumnGeneratorParameter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/columngenerator/parameter/SlidingTimeColumnGeneratorParameter.java
index 23fe2d711b4..9335c144325 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/columngenerator/parameter/SlidingTimeColumnGeneratorParameter.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/columngenerator/parameter/SlidingTimeColumnGeneratorParameter.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.utils.columngenerator.parameter;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.planner.plan.parameter.GroupByTimeParameter;
import org.apache.iotdb.db.utils.columngenerator.ColumnGeneratorType;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionSimpleRecoverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionSimpleRecoverTest.java
index 91be9c44d09..cd37faea6c2 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionSimpleRecoverTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionSimpleRecoverTest.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.db.metadata.schemaRegion;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.filter.impl.singlechild.IdFilter;
import org.apache.iotdb.commons.schema.filter.impl.values.InFilter;
import org.apache.iotdb.commons.schema.table.TsTable;
@@ -29,7 +30,6 @@ import org.apache.iotdb.commons.schema.table.column.IdColumnSchema;
import org.apache.iotdb.consensus.ConsensusFactory;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.schematree.ClusterSchemaTree;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.schema.TableDeviceAttributeUpdateNode;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java
index 32dcd88f42d..c49ea7cf35f 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/ConfigExecutionTest.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.queryengine.execution;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.QueryId;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.analyze.QueryType;
import org.apache.iotdb.db.queryengine.plan.execution.ExecutionResult;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeTreeSortOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeTreeSortOperatorTest.java
index 8f89b41b92a..486e7cbe2bd 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeTreeSortOperatorTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/MergeTreeSortOperatorTest.java
@@ -22,6 +22,7 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.NonAlignedFullPath;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.queryengine.common.FragmentInstanceId;
import org.apache.iotdb.db.queryengine.common.PlanFragmentId;
import org.apache.iotdb.db.queryengine.common.QueryId;
@@ -1838,6 +1839,11 @@ public class MergeTreeSortOperatorTest {
return null;
}
+ @Override
+ public String getSQLDialect() {
+ return IClientSession.SqlDialect.TREE.toString();
+ }
+
@Override
public void start() {}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryScanOperatorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryScanOperatorTest.java
index bc93de0f185..a5d4a6e6ace 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryScanOperatorTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/execution/operator/schema/SchemaQueryScanOperatorTest.java
@@ -23,11 +23,11 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.schema.SchemaConstant;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.FragmentInstanceId;
import org.apache.iotdb.db.queryengine.common.PlanFragmentId;
import org.apache.iotdb.db.queryengine.common.QueryId;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.execution.driver.DriverContext;
import org.apache.iotdb.db.queryengine.execution.driver.SchemaDriverContext;
import org.apache.iotdb.db.queryengine.execution.fragment.FragmentInstanceContext;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeTest.java
index 134e313deaa..cc2610202cc 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeTest.java
@@ -23,10 +23,10 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
import org.apache.iotdb.db.queryengine.common.QueryId;
import org.apache.iotdb.db.queryengine.common.SessionInfo;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.queryengine.common.header.DatasetHeader;
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.expression.binary.AdditionExpression;
@@ -66,7 +66,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.DEVICE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DEVICE;
import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.and;
import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.groupByTime;
import static org.apache.iotdb.db.queryengine.plan.expression.ExpressionFactory.gt;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
index 2a82d96d5d3..9b25ae7787f 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/optimization/TestPlanBuilder.java
@@ -67,7 +67,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import static org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant.DEVICE;
+import static org.apache.iotdb.commons.schema.column.ColumnHeaderConstant.DEVICE;
public class TestPlanBuilder {
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/DataQueryLogicalPlannerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/DataQueryLogicalPlannerTest.java
index fdedb18386f..f52b8c241a1 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/DataQueryLogicalPlannerTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/logical/DataQueryLogicalPlannerTest.java
@@ -22,8 +22,8 @@ package org.apache.iotdb.db.queryengine.plan.planner.logical;
import org.apache.iotdb.common.rpc.thrift.TAggregationType;
import org.apache.iotdb.commons.path.AlignedPath;
import org.apache.iotdb.commons.path.MeasurementPath;
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.common.QueryId;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeaderConstant;
import org.apache.iotdb.db.queryengine.plan.expression.Expression;
import org.apache.iotdb.db.queryengine.plan.expression.binary.GreaterThanExpression;
import org.apache.iotdb.db.queryengine.plan.expression.binary.LogicAndExpression;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AnalyzerTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AnalyzerTest.java
index 780add1a7f9..be735b12d35 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AnalyzerTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AnalyzerTest.java
@@ -55,19 +55,20 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributedPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.security.AccessControl;
import org.apache.iotdb.db.queryengine.plan.relational.security.AllowAllAccessControl;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.LogicalExpression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewriteFactory;
import org.apache.iotdb.db.queryengine.plan.statement.StatementTestUtils;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
@@ -134,7 +135,7 @@ public class AnalyzerTest {
PlanNode rootNode;
TableDistributedPlanner distributionPlanner;
DistributedQueryPlan distributedQueryPlan;
- TableScanNode tableScanNode;
+ DeviceTableScanNode deviceTableScanNode;
@Test
public void testMockQuery() throws OperatorNotFoundException {
@@ -193,20 +194,21 @@ public class AnalyzerTest {
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(((OutputNode) rootNode).getChild() instanceof TableScanNode);
- tableScanNode = (TableScanNode) ((OutputNode) rootNode).getChild();
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
+ assertTrue(((OutputNode) rootNode).getChild() instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) ((OutputNode) rootNode).getChild();
+ assertEquals("testdb.table1", deviceTableScanNode.getQualifiedObjectName().toString());
assertEquals(
Arrays.asList("time", "tag1", "tag2", "tag3", "attr1", "attr2", "s1", "s2", "s3"),
- tableScanNode.getOutputColumnNames());
- assertEquals(9, tableScanNode.getOutputSymbols().size());
- assertEquals(9, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
- assertEquals(5, tableScanNode.getIdAndAttributeIndexMap().size());
- assertEquals(ASC, tableScanNode.getScanOrder());
+ deviceTableScanNode.getOutputColumnNames());
+ assertEquals(9, deviceTableScanNode.getOutputSymbols().size());
+ assertEquals(9, deviceTableScanNode.getAssignments().size());
+ assertEquals(6, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(5, deviceTableScanNode.getIdAndAttributeIndexMap().size());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
assertTrue(
@@ -233,22 +235,24 @@ public class AnalyzerTest {
.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(((OutputNode) rootNode).getChild() instanceof TableScanNode);
- tableScanNode = (TableScanNode) ((OutputNode) rootNode).getChild();
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
+ assertTrue(((OutputNode) rootNode).getChild() instanceof DeviceTableScanNode);
+ this.deviceTableScanNode = (DeviceTableScanNode) ((OutputNode) rootNode).getChild();
+ assertEquals("testdb.table1", this.deviceTableScanNode.getQualifiedObjectName().toString());
assertEquals(
Arrays.asList("time", "tag1", "tag2", "tag3", "attr1", "attr2", "s1", "s2", "s3"),
- tableScanNode.getOutputColumnNames());
- assertEquals(9, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
- assertEquals(5, tableScanNode.getIdAndAttributeIndexMap().size());
+ this.deviceTableScanNode.getOutputColumnNames());
+ assertEquals(9, this.deviceTableScanNode.getAssignments().size());
+ assertEquals(6, this.deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(5, this.deviceTableScanNode.getIdAndAttributeIndexMap().size());
assertEquals(
- "(\"time\" > 1)", tableScanNode.getTimePredicate().map(Expression::toString).orElse(null));
- assertNull(tableScanNode.getPushDownPredicate());
- assertEquals(ASC, tableScanNode.getScanOrder());
+ "(\"time\" > 1)",
+ this.deviceTableScanNode.getTimePredicate().map(Expression::toString).orElse(null));
+ assertNull(this.deviceTableScanNode.getPushDownPredicate());
+ assertEquals(ASC, this.deviceTableScanNode.getScanOrder());
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
OutputNode outputNode =
@@ -259,23 +263,24 @@ public class AnalyzerTest {
assertTrue(
collectNode.getChildren().get(0) instanceof ExchangeNode
&& collectNode.getChildren().get(2) instanceof ExchangeNode);
- assertTrue(collectNode.getChildren().get(1) instanceof TableScanNode);
- TableScanNode tableScanNode = (TableScanNode) collectNode.getChildren().get(1);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
+ assertTrue(collectNode.getChildren().get(1) instanceof DeviceTableScanNode);
+ DeviceTableScanNode deviceTableScanNode =
+ (DeviceTableScanNode) collectNode.getChildren().get(1);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
assertEquals(
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B1.XX",
"table1.shenzhen.B2.ZZ",
"table1.shanghai.A3.YY"),
- tableScanNode.getDeviceEntries().stream()
+ deviceTableScanNode.getDeviceEntries().stream()
.map(d -> d.getDeviceID().toString())
.collect(Collectors.toList()));
}
@Test
public void singleTableWithFilterTest2() {
- // measurement value filter, which can be pushed down to TableScanNode
+ // measurement value filter, which can be pushed down to DeviceTableScanNode
sql = "SELECT tag1, attr2, s2 FROM table1 where s1 > 1";
analysis = analyzeSQL(sql, TEST_MATADATA, QUERY_CONTEXT);
final SymbolAllocator symbolAllocator = new SymbolAllocator();
@@ -285,24 +290,25 @@ public class AnalyzerTest {
.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertNotNull(tableScanNode.getPushDownPredicate());
- assertEquals("(\"s1\" > 1)", tableScanNode.getPushDownPredicate().toString());
- assertFalse(tableScanNode.getTimePredicate().isPresent());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertNotNull(deviceTableScanNode.getPushDownPredicate());
+ assertEquals("(\"s1\" > 1)", deviceTableScanNode.getPushDownPredicate().toString());
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
assertTrue(
Stream.of(Symbol.of("tag1"), Symbol.of("tag2"), Symbol.of("tag3"), Symbol.of("attr2"))
- .allMatch(tableScanNode.getIdAndAttributeIndexMap()::containsKey));
- assertEquals(0, (int) tableScanNode.getIdAndAttributeIndexMap().get(Symbol.of("attr2")));
- assertEquals(Arrays.asList("tag1", "attr2", "s2"), tableScanNode.getOutputColumnNames());
+ .allMatch(deviceTableScanNode.getIdAndAttributeIndexMap()::containsKey));
+ assertEquals(0, (int) deviceTableScanNode.getIdAndAttributeIndexMap().get(Symbol.of("attr2")));
+ assertEquals(Arrays.asList("tag1", "attr2", "s2"), deviceTableScanNode.getOutputColumnNames());
assertEquals(
ImmutableSet.of("tag1", "attr2", "s1", "s2"),
- tableScanNode.getAssignments().keySet().stream()
+ deviceTableScanNode.getAssignments().keySet().stream()
.map(Symbol::toString)
.collect(Collectors.toSet()));
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
OutputNode outputNode =
@@ -313,28 +319,28 @@ public class AnalyzerTest {
assertTrue(
collectNode.getChildren().get(0) instanceof ExchangeNode
&& collectNode.getChildren().get(2) instanceof ExchangeNode);
- assertTrue(collectNode.getChildren().get(1) instanceof TableScanNode);
- tableScanNode = (TableScanNode) collectNode.getChildren().get(1);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
+ assertTrue(collectNode.getChildren().get(1) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) collectNode.getChildren().get(1);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
assertEquals(
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B1.XX",
"table1.shenzhen.B2.ZZ",
"table1.shanghai.A3.YY"),
- tableScanNode.getDeviceEntries().stream()
+ deviceTableScanNode.getDeviceEntries().stream()
.map(d -> d.getDeviceID().toString())
.collect(Collectors.toList()));
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
distributedQueryPlan.getFragments().get(1).getPlanNodeTree().getChildren().get(0);
- assertEquals("(\"s1\" > 1)", tableScanNode.getPushDownPredicate().toString());
+ assertEquals("(\"s1\" > 1)", deviceTableScanNode.getPushDownPredicate().toString());
}
@Test
public void singleTableWithFilterTest3() {
// measurement value filter with time filter, take apart into pushDownPredicate and
- // timePredicate of TableScanNode
+ // timePredicate of DeviceTableScanNode
sql =
"SELECT tag1, attr1, s2 FROM table1 where s1 > 1 and s2>2 and tag1='A' and time > 1 and time < 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
@@ -348,18 +354,19 @@ public class AnalyzerTest {
logicalQueryPlan = logicalPlanner.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertNotNull(tableScanNode.getPushDownPredicate());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertNotNull(deviceTableScanNode.getPushDownPredicate());
assertEquals(
- "((\"s1\" > 1) AND (\"s2\" > 2))", tableScanNode.getPushDownPredicate().toString());
- assertTrue(tableScanNode.getTimePredicate().isPresent());
+ "((\"s1\" > 1) AND (\"s2\" > 2))", deviceTableScanNode.getPushDownPredicate().toString());
+ assertTrue(deviceTableScanNode.getTimePredicate().isPresent());
assertEquals(
- "((\"time\" > 1) AND (\"time\" < 10))", tableScanNode.getTimePredicate().get().toString());
- assertEquals(Arrays.asList("tag1", "attr1", "s2"), tableScanNode.getOutputColumnNames());
+ "((\"time\" > 1) AND (\"time\" < 10))",
+ deviceTableScanNode.getTimePredicate().get().toString());
+ assertEquals(Arrays.asList("tag1", "attr1", "s2"), deviceTableScanNode.getOutputColumnNames());
assertEquals(
ImmutableSet.of("time", "tag1", "attr1", "s1", "s2"),
- tableScanNode.getAssignments().keySet().stream()
+ deviceTableScanNode.getAssignments().keySet().stream()
.map(Symbol::toString)
.collect(Collectors.toSet()));
}
@@ -381,19 +388,20 @@ public class AnalyzerTest {
logicalQueryPlan = logicalPlanner.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertTrue(tableScanNode.getTimePredicate().isPresent());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertTrue(deviceTableScanNode.getTimePredicate().isPresent());
assertEquals(
- "((\"time\" > 1) OR (\"time\" < 10))", tableScanNode.getTimePredicate().get().toString());
- assertNotNull(tableScanNode.getPushDownPredicate());
+ "((\"time\" > 1) OR (\"time\" < 10))",
+ deviceTableScanNode.getTimePredicate().get().toString());
+ assertNotNull(deviceTableScanNode.getPushDownPredicate());
assertEquals(
"(((\"time\" > 1) OR (\"s1\" > 1)) AND ((\"time\" > 1) OR (\"s2\" > 2)))",
- tableScanNode.getPushDownPredicate().toString());
- assertEquals(Arrays.asList("tag1", "attr1", "s2"), tableScanNode.getOutputColumnNames());
+ deviceTableScanNode.getPushDownPredicate().toString());
+ assertEquals(Arrays.asList("tag1", "attr1", "s2"), deviceTableScanNode.getOutputColumnNames());
assertEquals(
ImmutableSet.of("time", "tag1", "attr1", "s1", "s2"),
- tableScanNode.getAssignments().keySet().stream()
+ deviceTableScanNode.getAssignments().keySet().stream()
.map(Symbol::toString)
.collect(Collectors.toSet()));
}
@@ -413,17 +421,17 @@ public class AnalyzerTest {
logicalQueryPlan = logicalPlanner.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertNotNull(tableScanNode.getPushDownPredicate());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertNotNull(deviceTableScanNode.getPushDownPredicate());
assertEquals(
"((\"time\" > 1) OR (\"s1\" > 1) OR (\"time\" < 10) OR (\"s2\" > 2))",
- tableScanNode.getPushDownPredicate().toString());
- assertFalse(tableScanNode.getTimePredicate().isPresent());
- assertEquals(Arrays.asList("tag1", "attr1", "s2"), tableScanNode.getOutputColumnNames());
+ deviceTableScanNode.getPushDownPredicate().toString());
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
+ assertEquals(Arrays.asList("tag1", "attr1", "s2"), deviceTableScanNode.getOutputColumnNames());
assertEquals(
ImmutableSet.of("time", "tag1", "attr1", "s1", "s2"),
- tableScanNode.getAssignments().keySet().stream()
+ deviceTableScanNode.getAssignments().keySet().stream()
.map(Symbol::toString)
.collect(Collectors.toSet()));
}
@@ -434,14 +442,14 @@ public class AnalyzerTest {
* └──FilterNode-2
* └──CollectNode-10
* ├──ExchangeNode-11: [SourceAddress:192.0.12.1/test_query.2.0/13]
- * ├──TableScanNode-8
+ * ├──DeviceTableScanNode-8
* └──ExchangeNode-12: [SourceAddress:192.0.10.1/test_query.3.0/14]
*
* IdentitySinkNode-13
- * └──TableScanNode-7
+ * └──DeviceTableScanNode-7
*
* IdentitySinkNode-14
- * └──TableScanNode-9
+ * └──DeviceTableScanNode-9
*/
@Test
public void singleTableWithFilterTest6() {
@@ -461,12 +469,15 @@ public class AnalyzerTest {
assertTrue(rootNode.getChildren().get(0).getChildren().get(0) instanceof FilterNode);
assertTrue(
rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0)
- instanceof TableScanNode);
- tableScanNode =
- (TableScanNode) rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0);
- assertEquals(Arrays.asList("tag1", "attr1", "s1", "s2"), tableScanNode.getOutputColumnNames());
+ instanceof DeviceTableScanNode);
+ deviceTableScanNode =
+ (DeviceTableScanNode)
+ rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0);
+ assertEquals(
+ Arrays.asList("tag1", "attr1", "s1", "s2"), deviceTableScanNode.getOutputColumnNames());
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
OutputNode outputNode =
@@ -482,20 +493,20 @@ public class AnalyzerTest {
assertTrue(
collectNode.getChildren().get(0) instanceof ExchangeNode
&& collectNode.getChildren().get(2) instanceof ExchangeNode);
- assertTrue(collectNode.getChildren().get(1) instanceof TableScanNode);
- tableScanNode = (TableScanNode) collectNode.getChildren().get(1);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
+ assertTrue(collectNode.getChildren().get(1) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) collectNode.getChildren().get(1);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
assertEquals(
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B1.XX",
"table1.shenzhen.B2.ZZ",
"table1.shanghai.A3.YY"),
- tableScanNode.getDeviceEntries().stream()
+ deviceTableScanNode.getDeviceEntries().stream()
.map(d -> d.getDeviceID().toString())
.collect(Collectors.toList()));
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
distributedQueryPlan.getFragments().get(1).getPlanNodeTree().getChildren().get(0);
sql = "SELECT tag1, attr1, s2 FROM table1 where diff(s1) + 1 > 1";
@@ -515,10 +526,12 @@ public class AnalyzerTest {
assertEquals("((diff(\"s1\") + 1) > 1)", filterNode.getPredicate().toString());
assertTrue(
rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0)
- instanceof TableScanNode);
- tableScanNode =
- (TableScanNode) rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0);
- assertEquals(Arrays.asList("tag1", "attr1", "s1", "s2"), tableScanNode.getOutputColumnNames());
+ instanceof DeviceTableScanNode);
+ deviceTableScanNode =
+ (DeviceTableScanNode)
+ rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0);
+ assertEquals(
+ Arrays.asList("tag1", "attr1", "s1", "s2"), deviceTableScanNode.getOutputColumnNames());
}
@Ignore
@@ -545,10 +558,11 @@ public class AnalyzerTest {
logicalQueryPlan = logicalPlanner.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ this.deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
assertEquals(
- Arrays.asList("time", "tag1", "attr1", "s1"), tableScanNode.getOutputColumnNames());
+ Arrays.asList("time", "tag1", "attr1", "s1"),
+ this.deviceTableScanNode.getOutputColumnNames());
// 2. project with filter
sql = "SELECT tag1, attr1, s1 FROM table1 WHERE tag2='A' and s2=8";
@@ -563,15 +577,15 @@ public class AnalyzerTest {
logicalQueryPlan = logicalPlanner.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- TableScanNode tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertFalse(tableScanNode.getTimePredicate().isPresent());
- assertEquals("(\"s2\" = 8)", tableScanNode.getPushDownPredicate().toString());
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertEquals(Arrays.asList("tag1", "attr1", "s1"), tableScanNode.getOutputColumnNames());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ DeviceTableScanNode deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
+ assertEquals("(\"s2\" = 8)", deviceTableScanNode.getPushDownPredicate().toString());
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertEquals(Arrays.asList("tag1", "attr1", "s1"), deviceTableScanNode.getOutputColumnNames());
assertEquals(
ImmutableSet.of("tag1", "attr1", "s1", "s2"),
- tableScanNode.getAssignments().keySet().stream()
+ deviceTableScanNode.getAssignments().keySet().stream()
.map(Symbol::toString)
.collect(Collectors.toSet()));
@@ -588,11 +602,11 @@ public class AnalyzerTest {
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode.getChildren().get(0) instanceof ProjectNode);
assertFalse(rootNode.getChildren().get(0).getChildren().get(0) instanceof FilterNode);
- assertTrue(rootNode.getChildren().get(0).getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0).getChildren().get(0);
- assertFalse(tableScanNode.getTimePredicate().isPresent());
- assertNull(tableScanNode.getPushDownPredicate());
- assertEquals(Arrays.asList("s1", "s2", "s3"), tableScanNode.getOutputColumnNames());
+ assertTrue(rootNode.getChildren().get(0).getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0).getChildren().get(0);
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
+ assertNull(deviceTableScanNode.getPushDownPredicate());
+ assertEquals(Arrays.asList("s1", "s2", "s3"), deviceTableScanNode.getOutputColumnNames());
// 4. project with not all attributes, to test the rightness of PruneUnUsedColumns
sql = "SELECT tag2, attr2, s2 FROM table1";
@@ -605,10 +619,10 @@ public class AnalyzerTest {
.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertEquals(Arrays.asList("tag2", "attr2", "s2"), tableScanNode.getOutputColumnNames());
- assertEquals(4, tableScanNode.getIdAndAttributeIndexMap().size());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertEquals(Arrays.asList("tag2", "attr2", "s2"), deviceTableScanNode.getOutputColumnNames());
+ assertEquals(4, deviceTableScanNode.getIdAndAttributeIndexMap().size());
}
@Test
@@ -628,11 +642,11 @@ public class AnalyzerTest {
// Is not null is pushed to schema region
assertEquals("(\"s1\" IS NULL)", filterNode.getPredicate().toString());
- assertTrue(rootNode.getChildren().get(0).getChildren().get(0) instanceof TableScanNode);
- TableScanNode tableScanNode =
- (TableScanNode) rootNode.getChildren().get(0).getChildren().get(0);
- assertNull(tableScanNode.getPushDownPredicate());
- assertFalse(tableScanNode.getTimePredicate().isPresent());
+ assertTrue(rootNode.getChildren().get(0).getChildren().get(0) instanceof DeviceTableScanNode);
+ DeviceTableScanNode deviceTableScanNode =
+ (DeviceTableScanNode) rootNode.getChildren().get(0).getChildren().get(0);
+ assertNull(deviceTableScanNode.getPushDownPredicate());
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
// 2. like
sql = "SELECT * FROM table1 WHERE tag1 like '%m'";
@@ -647,10 +661,10 @@ public class AnalyzerTest {
// Like is pushed to schema region
assertFalse(rootNode.getChildren().get(0) instanceof FilterNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertNull(tableScanNode.getPushDownPredicate());
- assertFalse(tableScanNode.getTimePredicate().isPresent());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertNull(deviceTableScanNode.getPushDownPredicate());
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
// 3. in / not in
sql =
@@ -667,10 +681,10 @@ public class AnalyzerTest {
// In and NotIn are pushed to schema region
assertFalse(rootNode.getChildren().get(0).getChildren().get(0) instanceof FilterNode);
- assertTrue(rootNode.getChildren().get(0).getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0).getChildren().get(0);
- assertNull(tableScanNode.getPushDownPredicate());
- assertFalse(tableScanNode.getTimePredicate().isPresent());
+ assertTrue(rootNode.getChildren().get(0).getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0).getChildren().get(0);
+ assertNull(deviceTableScanNode.getPushDownPredicate());
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
// 4. not
sql = "SELECT * FROM table1 WHERE tag1 not like '%m'";
@@ -695,10 +709,10 @@ public class AnalyzerTest {
rootNode = logicalQueryPlan.getRootNode();
assertFalse(rootNode.getChildren().get(0) instanceof FilterNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertNull(tableScanNode.getPushDownPredicate());
- assertFalse(tableScanNode.getTimePredicate().isPresent());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertNull(deviceTableScanNode.getPushDownPredicate());
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
// 6. String column comparisons
sql = "SELECT * FROM table1 WHERE tag1 != attr1";
@@ -712,10 +726,10 @@ public class AnalyzerTest {
rootNode = logicalQueryPlan.getRootNode();
assertFalse(rootNode.getChildren().get(0) instanceof FilterNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertNull(tableScanNode.getPushDownPredicate());
- assertFalse(tableScanNode.getTimePredicate().isPresent());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertNull(deviceTableScanNode.getPushDownPredicate());
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
// 7. Between
sql = "SELECT * FROM table1 WHERE tag1 Between attr1 and '2'";
@@ -729,10 +743,10 @@ public class AnalyzerTest {
rootNode = logicalQueryPlan.getRootNode();
assertFalse(rootNode.getChildren().get(0) instanceof FilterNode);
- assertTrue(rootNode.getChildren().get(0) instanceof TableScanNode);
- tableScanNode = (TableScanNode) rootNode.getChildren().get(0);
- assertNull(tableScanNode.getPushDownPredicate());
- assertFalse(tableScanNode.getTimePredicate().isPresent());
+ assertTrue(rootNode.getChildren().get(0) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) rootNode.getChildren().get(0);
+ assertNull(deviceTableScanNode.getPushDownPredicate());
+ assertFalse(deviceTableScanNode.getTimePredicate().isPresent());
}
@Test
@@ -800,7 +814,8 @@ public class AnalyzerTest {
FilterNode filterNode = (FilterNode) rootNode.getChildren().get(0).getChildren().get(0);
assertEquals("(DIFF(\"s2\") > 0)", filterNode.getPredicate().toString());
distributedQueryPlan =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA)
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null)
.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
OutputNode outputNode =
@@ -816,20 +831,20 @@ public class AnalyzerTest {
assertTrue(
collectNode.getChildren().get(0) instanceof ExchangeNode
&& collectNode.getChildren().get(2) instanceof ExchangeNode);
- assertTrue(collectNode.getChildren().get(1) instanceof TableScanNode);
- tableScanNode = (TableScanNode) collectNode.getChildren().get(1);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
+ assertTrue(collectNode.getChildren().get(1) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) collectNode.getChildren().get(1);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
assertEquals(
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B1.XX",
"table1.shenzhen.B2.ZZ",
"table1.shanghai.A3.YY"),
- tableScanNode.getDeviceEntries().stream()
+ deviceTableScanNode.getDeviceEntries().stream()
.map(d -> d.getDeviceID().toString())
.collect(Collectors.toList()));
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
distributedQueryPlan.getFragments().get(1).getPlanNodeTree().getChildren().get(0);
// 2. diff with time filter, tag filter and measurement filter
@@ -871,13 +886,15 @@ public class AnalyzerTest {
assertFalse(filterNode.getPredicate() instanceof LogicalExpression);
assertTrue(
rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0)
- instanceof TableScanNode);
- tableScanNode =
- (TableScanNode) rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0);
+ instanceof DeviceTableScanNode);
+ deviceTableScanNode =
+ (DeviceTableScanNode)
+ rootNode.getChildren().get(0).getChildren().get(0).getChildren().get(0);
assertTrue(
- tableScanNode.getPushDownPredicate() != null
- && tableScanNode.getPushDownPredicate() instanceof LogicalExpression);
- assertEquals(2, ((LogicalExpression) tableScanNode.getPushDownPredicate()).getTerms().size());
+ deviceTableScanNode.getPushDownPredicate() != null
+ && deviceTableScanNode.getPushDownPredicate() instanceof LogicalExpression);
+ assertEquals(
+ 2, ((LogicalExpression) deviceTableScanNode.getPushDownPredicate()).getTerms().size());
}
@Test
@@ -925,11 +942,11 @@ public class AnalyzerTest {
.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
- assertTrue(getChildrenNode(rootNode, 1) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 1) instanceof DeviceTableScanNode);
assertEquals(
"(((\"time\" > 1) AND (\"s1\" > 1)) OR (\"s2\" < 7) OR ((\"time\" < 10) AND (\"s1\" > 4)))",
Objects.requireNonNull(
- ((TableScanNode) getChildrenNode(rootNode, 1)).getPushDownPredicate())
+ ((DeviceTableScanNode) getChildrenNode(rootNode, 1)).getPushDownPredicate())
.toString());
}
@@ -942,16 +959,17 @@ public class AnalyzerTest {
logicalQueryPlan =
new TableLogicalPlanner(context, metadata, sessionInfo, symbolAllocator, warningCollector)
.plan(analysis);
- // logical plan: `OutputNode - ProjectNode - LimitNode - TableScanNode`
+ // logical plan: `OutputNode - ProjectNode - LimitNode - DeviceTableScanNode`
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
assertTrue(getChildrenNode(rootNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(rootNode, 2) instanceof LimitNode);
- assertTrue(getChildrenNode(rootNode, 3) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 3) instanceof DeviceTableScanNode);
// distributed plan: `IdentitySink - OutputNode - ProjectNode - LimitNode - CollectNode -
- // TableScanNode`, `IdentitySink - TableScan`
+ // DeviceTableScanNode`, `IdentitySink - TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertTrue(
getChildrenNode(distributedQueryPlan.getFragments().get(0).getPlanNodeTree(), 4)
@@ -959,17 +977,17 @@ public class AnalyzerTest {
CollectNode collectNode =
(CollectNode)
getChildrenNode(distributedQueryPlan.getFragments().get(0).getPlanNodeTree(), 4);
- assertTrue(collectNode.getChildren().get(1) instanceof TableScanNode);
- tableScanNode = (TableScanNode) collectNode.getChildren().get(1);
- assertEquals(10, tableScanNode.getPushDownLimit());
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ assertTrue(collectNode.getChildren().get(1) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) collectNode.getChildren().get(1);
+ assertEquals(10, deviceTableScanNode.getPushDownLimit());
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
assertTrue(
distributedQueryPlan.getFragments().get(0).getPlanNodeTree() instanceof IdentitySinkNode);
IdentitySinkNode identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 1);
- assertEquals(10, tableScanNode.getPushDownLimit());
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 1);
+ assertEquals(10, deviceTableScanNode.getPushDownLimit());
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
sql = "SELECT s1,s1+s3 FROM table1 where tag1='beijing' and tag2='A1' limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
@@ -978,24 +996,25 @@ public class AnalyzerTest {
logicalQueryPlan =
new TableLogicalPlanner(context, metadata, sessionInfo, symbolAllocator, warningCollector)
.plan(analysis);
- // logical plan: `OutputNode - ProjectNode - LimitNode - TableScanNode`
+ // logical plan: `OutputNode - ProjectNode - LimitNode - DeviceTableScanNode`
rootNode = logicalQueryPlan.getRootNode();
assertTrue(rootNode instanceof OutputNode);
assertTrue(getChildrenNode(rootNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(rootNode, 2) instanceof LimitNode);
- assertTrue(getChildrenNode(rootNode, 3) instanceof TableScanNode);
- // distributed plan: `IdentitySink - OutputNode - ProjectNode - TableScanNode`
+ assertTrue(getChildrenNode(rootNode, 3) instanceof DeviceTableScanNode);
+ // distributed plan: `IdentitySink - OutputNode - ProjectNode - DeviceTableScanNode`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertTrue(
distributedQueryPlan.getFragments().get(0).getPlanNodeTree() instanceof IdentitySinkNode);
identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(0).getPlanNodeTree();
- assertTrue(getChildrenNode(identitySinkNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 3);
- assertEquals(10, tableScanNode.getPushDownLimit());
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ assertTrue(getChildrenNode(identitySinkNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 3);
+ assertEquals(10, deviceTableScanNode.getPushDownLimit());
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
sql = "SELECT diff(s1) FROM table1 where tag1='beijing' and tag2='A1' limit 10";
context = new MPPQueryContext(sql, queryId, sessionInfo, null, null);
@@ -1004,18 +1023,19 @@ public class AnalyzerTest {
logicalQueryPlan =
new TableLogicalPlanner(context, metadata, sessionInfo, symbolAllocator, warningCollector)
.plan(analysis);
- // logical plan: `OutputNode - ProjectNode - LimitNode - TableScanNode`
+ // logical plan: `OutputNode - ProjectNode - LimitNode - DeviceTableScanNode`
rootNode = logicalQueryPlan.getRootNode();
- // distributed plan: `IdentitySink - OutputNode - ProjectNode - LimitNode - TableScanNode`
+ // distributed plan: `IdentitySink - OutputNode - ProjectNode - LimitNode - DeviceTableScanNode`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
List<PlanFragment> fragments = distributedQueryPlan.getFragments();
identitySinkNode = (IdentitySinkNode) fragments.get(0).getPlanNodeTree();
assertTrue(getChildrenNode(identitySinkNode, 3) instanceof LimitNode);
- assertTrue(getChildrenNode(identitySinkNode, 4) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 4);
- assertEquals(0, tableScanNode.getPushDownLimit());
+ assertTrue(getChildrenNode(identitySinkNode, 4) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 4);
+ assertEquals(0, deviceTableScanNode.getPushDownLimit());
}
@Test
@@ -1029,7 +1049,8 @@ public class AnalyzerTest {
.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertTrue(analysis.getRespDatasetHeader().getColumnNameIndexMap().containsKey("time"));
assertTrue(analysis.getRespDatasetHeader().getColumnNameIndexMap().containsKey("Time"));
@@ -1162,7 +1183,8 @@ public class AnalyzerTest {
assertArrayEquals(StatementTestUtils.genTimestamps(), insertTabletNode.getTimes());
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getInstances().size());
}
@@ -1207,7 +1229,8 @@ public class AnalyzerTest {
assertEquals(StatementTestUtils.genTimestamps()[0], insertNode.getTime());
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(1, distributedQueryPlan.getInstances().size());
}
@@ -1238,6 +1261,7 @@ public class AnalyzerTest {
statementAnalyzerFactory,
Collections.emptyList(),
Collections.emptyMap(),
+ new StatementRewriteFactory(metadata).getStatementRewrite(),
NOOP);
return analyzer.analyze(statement);
} catch (final Exception e) {
@@ -1262,6 +1286,7 @@ public class AnalyzerTest {
statementAnalyzerFactory,
Collections.emptyList(),
Collections.emptyMap(),
+ new StatementRewriteFactory(metadata).getStatementRewrite(),
NOOP);
return analyzer.analyze(statement);
}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AuthTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AuthTest.java
index 468e7e99df5..469e87de090 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AuthTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/AuthTest.java
@@ -30,6 +30,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.security.ITableAuthChecke
import org.apache.iotdb.db.queryengine.plan.relational.security.TableModelPrivilege;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewrite;
import org.junit.Test;
import org.mockito.Mockito;
@@ -210,6 +211,7 @@ public class AuthTest {
IClientSession clientSession = Mockito.mock(IClientSession.class);
Mockito.when(clientSession.getDatabaseName()).thenReturn(databaseNameInSessionInfo);
Statement statement = sqlParser.createStatement(sql, zoneId, clientSession);
+
SessionInfo session =
new SessionInfo(
0, userName, zoneId, databaseNameInSessionInfo, IClientSession.SqlDialect.TABLE);
@@ -223,6 +225,7 @@ public class AuthTest {
statementAnalyzerFactory,
Collections.emptyList(),
Collections.emptyMap(),
+ StatementRewrite.NOOP,
NOOP);
analyzer.analyze(statement);
}
@@ -231,6 +234,7 @@ public class AuthTest {
IClientSession clientSession = Mockito.mock(IClientSession.class);
Mockito.when(clientSession.getDatabaseName()).thenReturn(null);
Statement statement = sqlParser.createStatement(sql, zoneId, clientSession);
+
SessionInfo session =
new SessionInfo(0, userName, zoneId, null, IClientSession.SqlDialect.TABLE);
MPPQueryContext context = new MPPQueryContext(sql, QUERY_ID, 0, session, null, null);
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/JoinTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/JoinTest.java
index 6ac13043942..e11fc5130ed 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/JoinTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/JoinTest.java
@@ -22,6 +22,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributedPlanner;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
@@ -30,7 +31,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
@@ -71,7 +71,7 @@ public class JoinTest {
IdentitySinkNode identitySinkNode;
MergeSortNode mergeSortNode;
DistributedQueryPlan distributedQueryPlan;
- TableScanNode tableScanNode;
+ DeviceTableScanNode deviceTableScanNode;
// ========== table1 join table1 ===============
@@ -123,13 +123,15 @@ public class JoinTest {
assertTrue(joinNode.getLeftChild() instanceof SortNode);
assertTrue(joinNode.getRightChild() instanceof SortNode);
SortNode leftSortNode = (SortNode) joinNode.getLeftChild();
- assertTrue(getChildrenNode(leftSortNode, 1) instanceof TableScanNode);
- TableScanNode leftTableScanNode = (TableScanNode) getChildrenNode(leftSortNode, 1);
- assertTableScan(leftTableScanNode, ALL_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
+ assertTrue(getChildrenNode(leftSortNode, 1) instanceof DeviceTableScanNode);
+ DeviceTableScanNode leftDeviceTableScanNode =
+ (DeviceTableScanNode) getChildrenNode(leftSortNode, 1);
+ assertTableScan(leftDeviceTableScanNode, ALL_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
SortNode rightSortNode = (SortNode) joinNode.getRightChild();
- assertTrue(getChildrenNode(rightSortNode, 1) instanceof TableScanNode);
- TableScanNode rightTableScanNode = (TableScanNode) getChildrenNode(rightSortNode, 1);
- assertTableScan(rightTableScanNode, ALL_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
+ assertTrue(getChildrenNode(rightSortNode, 1) instanceof DeviceTableScanNode);
+ DeviceTableScanNode rightDeviceTableScanNode =
+ (DeviceTableScanNode) getChildrenNode(rightSortNode, 1);
+ assertTableScan(rightDeviceTableScanNode, ALL_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
/*
* IdentitySinkNode-178
@@ -140,32 +142,33 @@ public class JoinTest {
* ├──MergeSortNode-115
* │ ├──ExchangeNode-172: [SourceAddress:192.0.12.1/test_query.2.0/176]
* │ ├──SortNode-117
- * │ │ └──TableScanNode-113
+ * │ │ └──DeviceTableScanNode-113
* │ └──ExchangeNode-173: [SourceAddress:192.0.10.1/test_query.3.0/177]
* └──MergeSortNode-128
* ├──ExchangeNode-174: [SourceAddress:192.0.12.1/test_query.2.0/176]
* ├──SortNode-130
- * │ └──TableScanNode-126
+ * │ └──DeviceTableScanNode-126
* └──ExchangeNode-175: [SourceAddress:192.0.10.1/test_query.3.0/177]
*
* IdentitySinkNode-201
* └──SortNode-141
- * └──TableScanNode-137
+ * └──DeviceTableScanNode-137
*
* IdentitySinkNode-201
* └──SortNode-141
- * └──TableScanNode-137
+ * └──DeviceTableScanNode-137
*
* IdentitySinkNode-203
* └──SortNode-154
- * └──TableScanNode-150
+ * └──DeviceTableScanNode-150
*
* IdentitySinkNode-203
* └──SortNode-154
- * └──TableScanNode-150
+ * └──DeviceTableScanNode-150
*/
distributedQueryPlan =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA)
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null)
.plan();
assertEquals(5, distributedQueryPlan.getFragments().size());
IdentitySinkNode identitySinkNode =
@@ -177,22 +180,23 @@ public class JoinTest {
MergeSortNode mergeSortNode = (MergeSortNode) joinNode.getLeftChild();
assertMergeSortNode(mergeSortNode);
leftSortNode = (SortNode) mergeSortNode.getChildren().get(1);
- tableScanNode = (TableScanNode) getChildrenNode(leftSortNode, 1);
- assertTableScan(tableScanNode, SHANGHAI_SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(leftSortNode, 1);
+ assertTableScan(
+ deviceTableScanNode, SHANGHAI_SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof SortNode);
- assertTrue(getChildrenNode(identitySinkNode, 2) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 2);
- assertTableScan(tableScanNode, SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
+ assertTrue(getChildrenNode(identitySinkNode, 2) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 2);
+ assertTableScan(deviceTableScanNode, SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(3).getPlanNodeTree();
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof SortNode);
- assertTrue(getChildrenNode(identitySinkNode, 2) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 2);
- assertTableScan(tableScanNode, SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
+ assertTrue(getChildrenNode(identitySinkNode, 2) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 2);
+ assertTableScan(deviceTableScanNode, SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
}
// has filter which can be push down, filter can in subquery or outer query
@@ -277,13 +281,16 @@ public class JoinTest {
assertTrue(joinNode.getLeftChild() instanceof SortNode);
assertTrue(joinNode.getRightChild() instanceof SortNode);
SortNode leftSortNode = (SortNode) joinNode.getLeftChild();
- assertEquals(TableScanNode.class, getChildrenNode(leftSortNode, 1).getClass());
- TableScanNode leftTableScanNode = (TableScanNode) getChildrenNode(leftSortNode, 1);
- assertTableScan(leftTableScanNode, BEIJING_A1_DEVICE_ENTRY, Ordering.ASC, 0, 0, true, "");
+ assertEquals(DeviceTableScanNode.class, getChildrenNode(leftSortNode, 1).getClass());
+ DeviceTableScanNode leftDeviceTableScanNode =
+ (DeviceTableScanNode) getChildrenNode(leftSortNode, 1);
+ assertTableScan(leftDeviceTableScanNode, BEIJING_A1_DEVICE_ENTRY, Ordering.ASC, 0, 0, true, "");
SortNode rightSortNode = (SortNode) joinNode.getRightChild();
- assertTrue(getChildrenNode(rightSortNode, 1) instanceof TableScanNode);
- TableScanNode rightTableScanNode = (TableScanNode) getChildrenNode(rightSortNode, 1);
- assertTableScan(rightTableScanNode, SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
+ assertTrue(getChildrenNode(rightSortNode, 1) instanceof DeviceTableScanNode);
+ DeviceTableScanNode rightDeviceTableScanNode =
+ (DeviceTableScanNode) getChildrenNode(rightSortNode, 1);
+ assertTableScan(
+ rightDeviceTableScanNode, SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
/*
* IdentitySinkNode-197
@@ -295,18 +302,19 @@ public class JoinTest {
* ├──ExchangeNode-193: [SourceAddress:192.0.10.1/test_query.2.0/195]
* └──MergeSortNode-165
* ├──SortNode-166
- * │ └──TableScanNode-163
+ * │ └──DeviceTableScanNode-163
* └──ExchangeNode-194: [SourceAddress:192.0.11.1/test_query.3.0/196]
*
* IdentitySinkNode-195
- * └──TableScanNode-158
+ * └──DeviceTableScanNode-158
*
* IdentitySinkNode-196
* └──SortNode-167
- * └──TableScanNode-164
+ * └──DeviceTableScanNode-164
*/
distributedQueryPlan =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA)
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null)
.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
identitySinkNode =
@@ -316,14 +324,15 @@ public class JoinTest {
assertTrue(joinNode.getLeftChild() instanceof ExchangeNode);
assertTrue(joinNode.getRightChild() instanceof MergeSortNode);
mergeSortNode = (MergeSortNode) joinNode.getRightChild();
- assertNodeMatches(mergeSortNode, MergeSortNode.class, SortNode.class, TableScanNode.class);
- tableScanNode = (TableScanNode) getChildrenNode(mergeSortNode, 2);
- assertTableScan(tableScanNode, SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
+ assertNodeMatches(
+ mergeSortNode, MergeSortNode.class, SortNode.class, DeviceTableScanNode.class);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(mergeSortNode, 2);
+ assertTableScan(deviceTableScanNode, SHENZHEN_DEVICE_ENTRIES, Ordering.ASC, 0, 0, true, "");
identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 1);
- assertTableScan(tableScanNode, BEIJING_A1_DEVICE_ENTRY, Ordering.ASC, 0, 0, true, "");
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 1);
+ assertTableScan(deviceTableScanNode, BEIJING_A1_DEVICE_ENTRY, Ordering.ASC, 0, 0, true, "");
}
// has filter which can be push down, inner limit, test if inner limit can be pushed down
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/LimitOffsetPushDownTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/LimitOffsetPushDownTest.java
index e16c13e598a..1690ab3c129 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/LimitOffsetPushDownTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/LimitOffsetPushDownTest.java
@@ -26,11 +26,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributedPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.junit.Test;
@@ -66,7 +66,7 @@ public class LimitOffsetPushDownTest {
PlanNode rootNode;
TableDistributedPlanner distributionPlanner;
DistributedQueryPlan distributedQueryPlan;
- TableScanNode tableScanNode;
+ DeviceTableScanNode deviceTableScanNode;
// without sort operation, limit can be pushed into TableScan, pushLimitToEachDevice==false
@Test
@@ -81,33 +81,37 @@ public class LimitOffsetPushDownTest {
rootNode = logicalQueryPlan.getRootNode();
// LogicalPlan: `Output - Project - Offset - Limit - TableScan`
assertTrue(getChildrenNode(rootNode, 3) instanceof LimitNode);
- assertTrue(getChildrenNode(rootNode, 4) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 4) instanceof DeviceTableScanNode);
// DistributePlan: `Output - Project - Offset - Limit - Collect - TableScan`
distributionPlanner =
new TableDistributedPlanner(
- this.analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ this.analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
CollectNode collectNode =
(CollectNode)
getChildrenNode(distributedQueryPlan.getFragments().get(0).getPlanNodeTree(), 5);
assertTrue(collectNode.getChildren().get(0) instanceof ExchangeNode);
- assertTrue(collectNode.getChildren().get(1) instanceof TableScanNode);
+ assertTrue(collectNode.getChildren().get(1) instanceof DeviceTableScanNode);
assertTrue(collectNode.getChildren().get(2) instanceof ExchangeNode);
- tableScanNode = (TableScanNode) collectNode.getChildren().get(1);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
- assertEquals(ASC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 15 && tableScanNode.getPushDownOffset() == 0);
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ deviceTableScanNode = (DeviceTableScanNode) collectNode.getChildren().get(1);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 15
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
getChildrenNode(distributedQueryPlan.getFragments().get(1).getPlanNodeTree(), 1);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
- assertEquals(ASC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 15 && tableScanNode.getPushDownOffset() == 0);
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 15
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
}
// order by all IDs, limit can be pushed into TableScan, pushLimitToEachDevice==false
@@ -123,12 +127,12 @@ public class LimitOffsetPushDownTest {
.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
// LogicalPlan: `Output - Offset - Limit - Project - StreamSort - Project - TableScan`
- assertTrue(getChildrenNode(rootNode, 6) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 6) instanceof DeviceTableScanNode);
// DistributePlan: `IdentitySink - Output - Offset - Project - TopK - Project - TableScan`
distributionPlanner =
new TableDistributedPlanner(
- this.analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ this.analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
TopKNode topKNode =
@@ -136,20 +140,24 @@ public class LimitOffsetPushDownTest {
assertTrue(topKNode.getChildren().get(0) instanceof ExchangeNode);
assertTrue(topKNode.getChildren().get(1) instanceof ProjectNode);
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
- tableScanNode = (TableScanNode) getChildrenNode(topKNode.getChildren().get(1), 1);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
- assertEquals(DESC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 15 && tableScanNode.getPushDownOffset() == 0);
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(topKNode.getChildren().get(1), 1);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(DESC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 15
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
// `Identity - Project - TableScan`
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
getChildrenNode(distributedQueryPlan.getFragments().get(1).getPlanNodeTree(), 2);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
- assertEquals(DESC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 15 && tableScanNode.getPushDownOffset() == 0);
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(DESC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 15
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
sql = "SELECT * FROM table1 order by tag2 desc, tag1 asc, attr1 desc, tag3 desc limit 10";
analysis = analyzeSQL(sql, TEST_MATADATA, QUERY_CONTEXT);
@@ -160,33 +168,37 @@ public class LimitOffsetPushDownTest {
.plan(analysis);
rootNode = logicalQueryPlan.getRootNode();
// LogicalPlan: `Output - Limit - StreamSort - TableScan`
- assertTrue(getChildrenNode(rootNode, 3) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 3) instanceof DeviceTableScanNode);
// DistributePlan: `IdentitySink - Output - TopK - TableScan`
distributionPlanner =
new TableDistributedPlanner(
- this.analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ this.analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
topKNode =
(TopKNode) getChildrenNode(distributedQueryPlan.getFragments().get(0).getPlanNodeTree(), 2);
assertTrue(topKNode.getChildren().get(0) instanceof ExchangeNode);
- assertTrue(topKNode.getChildren().get(1) instanceof TableScanNode);
+ assertTrue(topKNode.getChildren().get(1) instanceof DeviceTableScanNode);
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
- tableScanNode = (TableScanNode) topKNode.getChildren().get(1);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
- assertEquals(ASC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 10 && tableScanNode.getPushDownOffset() == 0);
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ deviceTableScanNode = (DeviceTableScanNode) topKNode.getChildren().get(1);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 10
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
// `Identity - TableScan`
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
distributedQueryPlan.getFragments().get(1).getPlanNodeTree().getChildren().get(0);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
- assertEquals(ASC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 10 && tableScanNode.getPushDownOffset() == 0);
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 10
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
}
// order by some tags, limit can be pushed into TableScan, pushLimitToEachDevice==true
@@ -203,12 +215,13 @@ public class LimitOffsetPushDownTest {
rootNode = logicalQueryPlan.getRootNode();
// LogicalPlan: `Output - Offset - Limit - Project - StreamSort - Project - TableScan`
assertTrue(getChildrenNode(rootNode, 4) instanceof StreamSortNode);
- assertTrue(getChildrenNode(rootNode, 6) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 6) instanceof DeviceTableScanNode);
// DistributePlan: `Identity - Output - Offset - Project - TopK - Limit - StreamSort - Project -
// TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
TopKNode topKNode =
@@ -216,20 +229,24 @@ public class LimitOffsetPushDownTest {
assertTrue(topKNode.getChildren().get(0) instanceof ExchangeNode);
assertTrue(topKNode.getChildren().get(1) instanceof LimitNode);
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
- tableScanNode = (TableScanNode) getChildrenNode(topKNode.getChildren().get(1), 3);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
- assertEquals(DESC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 15 && tableScanNode.getPushDownOffset() == 0);
- assertTrue(tableScanNode.isPushLimitToEachDevice());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(topKNode.getChildren().get(1), 3);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(DESC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 15
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertTrue(deviceTableScanNode.isPushLimitToEachDevice());
// `IdentitySink - Limit - StreamSort - Project - TableScan`
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
getChildrenNode(distributedQueryPlan.getFragments().get(1).getPlanNodeTree(), 4);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
- assertEquals(DESC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 15 && tableScanNode.getPushDownOffset() == 0);
- assertTrue(tableScanNode.isPushLimitToEachDevice());
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(DESC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 15
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertTrue(deviceTableScanNode.isPushLimitToEachDevice());
}
// order by time, limit can be pushed into TableScan, pushLimitToEachDevice==true
@@ -246,12 +263,13 @@ public class LimitOffsetPushDownTest {
// LogicalPlan: `Output - Offset - Project - TopK - Project - TableScan`
rootNode = logicalQueryPlan.getRootNode();
assertTrue(getChildrenNode(rootNode, 3) instanceof TopKNode);
- assertTrue(getChildrenNode(rootNode, 5) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 5) instanceof DeviceTableScanNode);
// DistributePlan-1 `Identity - Output - Offset - Project - TopK - {Exchange + TopK + Exchange}
// DistributePlan-2 `Identity - TopK - Project - TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
TopKNode topKNode =
@@ -259,19 +277,23 @@ public class LimitOffsetPushDownTest {
assertTrue(topKNode.getChildren().get(0) instanceof ExchangeNode);
assertTrue(topKNode.getChildren().get(1) instanceof TopKNode);
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
- tableScanNode = (TableScanNode) getChildrenNode(topKNode.getChildren().get(1), 2);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
- assertEquals(DESC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 15 && tableScanNode.getPushDownOffset() == 0);
- assertTrue(tableScanNode.isPushLimitToEachDevice());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(topKNode.getChildren().get(1), 2);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(DESC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 15
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertTrue(deviceTableScanNode.isPushLimitToEachDevice());
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
getChildrenNode(distributedQueryPlan.getFragments().get(1).getPlanNodeTree(), 3);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
- assertEquals(DESC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 15 && tableScanNode.getPushDownOffset() == 0);
- assertTrue(tableScanNode.isPushLimitToEachDevice());
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(DESC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 15
+ && deviceTableScanNode.getPushDownOffset() == 0);
+ assertTrue(deviceTableScanNode.isPushLimitToEachDevice());
}
// order by others, limit can not be pushed into TableScan
@@ -288,12 +310,13 @@ public class LimitOffsetPushDownTest {
// LogicalPlan: `Output - Offset - Project - TopK - Project - TableScan`
rootNode = logicalQueryPlan.getRootNode();
assertTrue(getChildrenNode(rootNode, 3) instanceof TopKNode);
- assertTrue(getChildrenNode(rootNode, 5) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 5) instanceof DeviceTableScanNode);
// DistributePlan-1 `Identity - Output - Offset - Project - TopK - {Exchange + TopK + Exchange}
// DistributePlan-2 `Identity - TopK - Project - TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
TopKNode topKNode =
@@ -301,17 +324,21 @@ public class LimitOffsetPushDownTest {
assertTrue(topKNode.getChildren().get(0) instanceof ExchangeNode);
assertTrue(topKNode.getChildren().get(1) instanceof TopKNode);
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
- tableScanNode = (TableScanNode) getChildrenNode(topKNode.getChildren().get(1), 2);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
- assertEquals(ASC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 0 && tableScanNode.getPushDownOffset() == 0);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(topKNode.getChildren().get(1), 2);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 0
+ && deviceTableScanNode.getPushDownOffset() == 0);
- tableScanNode =
- (TableScanNode)
+ deviceTableScanNode =
+ (DeviceTableScanNode)
getChildrenNode(distributedQueryPlan.getFragments().get(1).getPlanNodeTree(), 3);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
- assertEquals(ASC, tableScanNode.getScanOrder());
- assertTrue(tableScanNode.getPushDownLimit() == 0 && tableScanNode.getPushDownOffset() == 0);
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
+ assertTrue(
+ deviceTableScanNode.getPushDownLimit() == 0
+ && deviceTableScanNode.getPushDownOffset() == 0);
}
/** Actually with diff function, LimitNode should be above of ProjectNode. */
@@ -328,6 +355,6 @@ public class LimitOffsetPushDownTest {
rootNode = logicalQueryPlan.getRootNode();
assertTrue(getChildrenNode(rootNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(rootNode, 2) instanceof LimitNode);
- assertTrue(getChildrenNode(rootNode, 3) instanceof TableScanNode);
+ assertTrue(getChildrenNode(rootNode, 3) instanceof DeviceTableScanNode);
}
}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/MockTableModelDataPartition.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/MockTableModelDataPartition.java
index ab798fa1f50..db6e1addeb0 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/MockTableModelDataPartition.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/MockTableModelDataPartition.java
@@ -176,7 +176,7 @@ public class MockTableModelDataPartition {
genDataNodeLocation(dataNodeId2, String.format("192.0.%s.2", regionGroupId))));
}
- private static TDataNodeLocation genDataNodeLocation(int dataNodeId, String ip) {
+ public static TDataNodeLocation genDataNodeLocation(int dataNodeId, String ip) {
return new TDataNodeLocation()
.setDataNodeId(dataNodeId)
.setClientRpcEndPoint(new TEndPoint(ip, 9000))
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ShowQueriesTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ShowQueriesTest.java
new file mode 100644
index 00000000000..275369844d3
--- /dev/null
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/ShowQueriesTest.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.db.queryengine.plan.relational.analyzer;
+
+import org.apache.iotdb.db.queryengine.plan.planner.plan.LogicalQueryPlan;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.PlanTester;
+
+import org.junit.Test;
+
+import java.util.Optional;
+
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanAssert.assertPlan;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.collect;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.exchange;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.infoSchemaTableScan;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.limit;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.mergeSort;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.offset;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.output;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.PlanMatchPattern.sort;
+
+public class ShowQueriesTest {
+ private final PlanTester planTester = new PlanTester();
+
+ @Test
+ public void testNormal() {
+ LogicalQueryPlan logicalQueryPlan = planTester.createPlan("show queries");
+ assertPlan(
+ logicalQueryPlan,
+ output(infoSchemaTableScan("information_schema.queries", Optional.empty())));
+
+ // - Exchange
+ // Output - Collect - Exchange
+ assertPlan(planTester.getFragmentPlan(0), output(collect(exchange(), exchange())));
+ // TableScan
+ assertPlan(
+ planTester.getFragmentPlan(1),
+ infoSchemaTableScan("information_schema.queries", Optional.of(1)));
+ // TableScan
+ assertPlan(
+ planTester.getFragmentPlan(2),
+ infoSchemaTableScan("information_schema.queries", Optional.of(2)));
+ }
+
+ @Test
+ public void testLimitOffset() {
+ LogicalQueryPlan logicalQueryPlan = planTester.createPlan("show queries limit 1 offset 2");
+ assertPlan(
+ logicalQueryPlan,
+ output(
+ offset(
+ 2, limit(3, infoSchemaTableScan("information_schema.queries", Optional.empty())))));
+
+ // - Exchange
+ // Output - offset - limit - Collect - Exchange
+ assertPlan(
+ planTester.getFragmentPlan(0),
+ output(offset(2, limit(3, collect(exchange(), exchange())))));
+ // TableScan
+ assertPlan(
+ planTester.getFragmentPlan(1),
+ infoSchemaTableScan("information_schema.queries", Optional.of(1)));
+ // TableScan
+ assertPlan(
+ planTester.getFragmentPlan(2),
+ infoSchemaTableScan("information_schema.queries", Optional.of(2)));
+ }
+
+ @Test
+ public void testSort() {
+ LogicalQueryPlan logicalQueryPlan =
+ planTester.createPlan("show queries order by time, query_id");
+ assertPlan(
+ logicalQueryPlan,
+ output(sort(infoSchemaTableScan("information_schema.queries", Optional.empty()))));
+
+ // - Exchange
+ // Output - MergeSort - Exchange
+ assertPlan(planTester.getFragmentPlan(0), output(mergeSort(exchange(), exchange())));
+ // Sort - TableScan
+ assertPlan(
+ planTester.getFragmentPlan(1),
+ sort(infoSchemaTableScan("information_schema.queries", Optional.of(1))));
+ // Sort - TableScan
+ assertPlan(
+ planTester.getFragmentPlan(2),
+ sort(infoSchemaTableScan("information_schema.queries", Optional.of(2))));
+ }
+}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SortTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SortTest.java
index 1d73c11085d..adb7922ca54 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SortTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SortTest.java
@@ -29,6 +29,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributedPlanner;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
@@ -37,7 +38,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
@@ -76,7 +76,7 @@ public class SortTest {
StreamSortNode streamSortNode;
TableDistributedPlanner distributionPlanner;
DistributedQueryPlan distributedQueryPlan;
- TableScanNode tableScanNode;
+ DeviceTableScanNode deviceTableScanNode;
// order by some_ids, time, others; has filter
@Test
@@ -101,23 +101,24 @@ public class SortTest {
streamSortNode = (StreamSortNode) getChildrenNode(logicalPlanNode, 4);
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- assertTrue(getChildrenNode(streamSortNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
- assertEquals(8, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
- assertEquals(4, tableScanNode.getIdAndAttributeIndexMap().size());
+ assertTrue(getChildrenNode(streamSortNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
+ assertEquals("testdb.table1", deviceTableScanNode.getQualifiedObjectName().toString());
+ assertEquals(8, deviceTableScanNode.getAssignments().size());
+ assertEquals(6, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(4, deviceTableScanNode.getIdAndAttributeIndexMap().size());
// TODO change scan order in logical plan
- assertEquals(ASC, tableScanNode.getScanOrder());
- assertEquals(0, tableScanNode.getPushDownLimit());
- assertEquals(0, tableScanNode.getPushDownOffset());
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
+ assertEquals(0, deviceTableScanNode.getPushDownLimit());
+ assertEquals(0, deviceTableScanNode.getPushDownOffset());
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
// DistributePlan: `Output-Offset-Limit-Project-MergeSort-StreamSort-Project-Filter-TableScan`
// to
// `Output-Offset-Project-TopK-Limit-StreamSort-Project-Filter-TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
IdentitySinkNode identitySinkNode =
@@ -132,9 +133,9 @@ public class SortTest {
streamSortNode = (StreamSortNode) getChildrenNode(topKNode.getChildren().get(1), 1);
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B2.ZZ",
@@ -153,10 +154,10 @@ public class SortTest {
streamSortNode = (StreamSortNode) getChildrenNode(limitNode, 1);
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B2.ZZ", "table1.shenzhen.B1.XX"),
DESC,
0,
@@ -175,7 +176,8 @@ public class SortTest {
// LogicalPlan: `Output-Offset-Limit-StreamSort-TableScan`
assertTrue(getChildrenNode(logicalPlanNode, 3) instanceof StreamSortNode);
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
// DistributedPlan: `Output-Offset-TopK-Limit-TableScan`
@@ -184,7 +186,7 @@ public class SortTest {
assertTrue(getChildrenNode(identitySinkNode, 3) instanceof TopKNode);
topKNode = (TopKNode) getChildrenNode(identitySinkNode, 3);
assertTrue(topKNode.getChildren().get(1) instanceof LimitNode);
- assertTrue(getChildrenNode(topKNode.getChildren().get(1), 1) instanceof TableScanNode);
+ assertTrue(getChildrenNode(topKNode.getChildren().get(1), 1) instanceof DeviceTableScanNode);
}
// order by all_ids, time, others
@@ -211,17 +213,18 @@ public class SortTest {
StreamSortNode streamSortNode = (StreamSortNode) getChildrenNode(logicalPlanNode, 4);
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- assertTrue(getChildrenNode(streamSortNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
- assertEquals(8, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
+ assertTrue(getChildrenNode(streamSortNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
+ assertEquals("testdb.table1", deviceTableScanNode.getQualifiedObjectName().toString());
+ assertEquals(8, deviceTableScanNode.getAssignments().size());
+ assertEquals(6, deviceTableScanNode.getDeviceEntries().size());
// DistributePlan: optimize
// `Output-Offset-Limit-Project-MergeSort-StreamSort-Project-Filter-TableScan`
// to `Output-Offset-Project-TopK-Limit-Project-Filter-TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
outputNode =
@@ -238,9 +241,9 @@ public class SortTest {
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
projectNode = (ProjectNode) getChildrenNode(topKNode.getChildren().get(1), 1);
assertTrue(getChildrenNode(projectNode, 1) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(projectNode, 2);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(projectNode, 2);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B2.ZZ",
@@ -258,10 +261,10 @@ public class SortTest {
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof LimitNode);
assertTrue(getChildrenNode(identitySinkNode, 2) instanceof ProjectNode);
assertTrue(getChildrenNode(identitySinkNode, 3) instanceof FilterNode);
- assertTrue(getChildrenNode(identitySinkNode, 4) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 4);
+ assertTrue(getChildrenNode(identitySinkNode, 4) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 4);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B2.ZZ", "table1.shenzhen.B1.XX"),
DESC,
0,
@@ -293,15 +296,16 @@ public class SortTest {
StreamSortNode streamSortNode = (StreamSortNode) getChildrenNode(logicalPlanNode, 2);
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- assertTrue(getChildrenNode(streamSortNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
- assertEquals(8, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
+ assertTrue(getChildrenNode(streamSortNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
+ assertEquals("testdb.table1", deviceTableScanNode.getQualifiedObjectName().toString());
+ assertEquals(8, deviceTableScanNode.getAssignments().size());
+ assertEquals(6, deviceTableScanNode.getDeviceEntries().size());
// DistributePlan: optimize `Output-Project-MergeSort-Project-Filter-TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
outputNode =
@@ -314,10 +318,10 @@ public class SortTest {
assertTrue(mergeSortNode.getChildren().get(2) instanceof ExchangeNode);
projectNode = (ProjectNode) mergeSortNode.getChildren().get(1);
assertTrue(getChildrenNode(projectNode, 1) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(projectNode, 2);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(projectNode, 2);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B2.ZZ",
@@ -334,9 +338,9 @@ public class SortTest {
(ProjectNode)
distributedQueryPlan.getFragments().get(1).getPlanNodeTree().getChildren().get(0);
assertTrue(getChildrenNode(projectNode, 1) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(projectNode, 2);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(projectNode, 2);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B2.ZZ", "table1.shenzhen.B1.XX"),
DESC,
0,
@@ -369,22 +373,23 @@ public class SortTest {
assertEquals(1, streamSortNode.getStreamCompareKeyEndIndex());
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- assertTrue(getChildrenNode(streamSortNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
- assertEquals(8, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
- assertEquals(4, tableScanNode.getIdAndAttributeIndexMap().size());
- assertEquals(ASC, tableScanNode.getScanOrder());
- assertEquals(0, tableScanNode.getPushDownLimit());
- assertEquals(0, tableScanNode.getPushDownOffset());
- assertFalse(tableScanNode.isPushLimitToEachDevice());
+ assertTrue(getChildrenNode(streamSortNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
+ assertEquals("testdb.table1", deviceTableScanNode.getQualifiedObjectName().toString());
+ assertEquals(8, deviceTableScanNode.getAssignments().size());
+ assertEquals(6, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(4, deviceTableScanNode.getIdAndAttributeIndexMap().size());
+ assertEquals(ASC, deviceTableScanNode.getScanOrder());
+ assertEquals(0, deviceTableScanNode.getPushDownLimit());
+ assertEquals(0, deviceTableScanNode.getPushDownOffset());
+ assertFalse(deviceTableScanNode.isPushLimitToEachDevice());
// DistributePlan: optimize
// `Output-Offset-Limit-Project-MergeSort-StreamSort-Project-Filter-TableScan` to
// `Output-Offset-Project-TopK-Limit-StreamSort-Project-Filter-TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
outputNode =
@@ -399,9 +404,9 @@ public class SortTest {
streamSortNode = (StreamSortNode) getChildrenNode(topKNode.getChildren().get(1), 1);
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B2.ZZ",
@@ -419,9 +424,9 @@ public class SortTest {
getChildrenNode(distributedQueryPlan.getFragments().get(1).getPlanNodeTree(), 2);
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B2.ZZ", "table1.shenzhen.B1.XX"),
ASC,
0,
@@ -454,18 +459,19 @@ public class SortTest {
assertEquals(2, streamSortNode.getStreamCompareKeyEndIndex());
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- assertTrue(getChildrenNode(streamSortNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
- assertEquals(8, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
- assertEquals(4, tableScanNode.getIdAndAttributeIndexMap().size());
+ assertTrue(getChildrenNode(streamSortNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
+ assertEquals("testdb.table1", deviceTableScanNode.getQualifiedObjectName().toString());
+ assertEquals(8, deviceTableScanNode.getAssignments().size());
+ assertEquals(6, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(4, deviceTableScanNode.getIdAndAttributeIndexMap().size());
// DistributePlan: optimize
// `Output-Offset-Limit-Project-MergeSort-StreamSort-Project-Filter-TableScan`
// to `Output-Offset-Project-TopK-Limit-StreamSort-Project-Filter-TableScan`
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
outputNode =
@@ -481,10 +487,10 @@ public class SortTest {
streamSortNode = (StreamSortNode) getChildrenNode(topKNode.getChildren().get(1), 1);
assertTrue(getChildrenNode(streamSortNode, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(streamSortNode, 2) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(streamSortNode, 3);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(streamSortNode, 3);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shanghai.B3.YY",
"table1.shenzhen.B2.ZZ",
@@ -501,11 +507,11 @@ public class SortTest {
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
assertTrue(getChildrenNode(sinkNode, 1) instanceof LimitNode);
assertTrue(getChildrenNode(sinkNode, 2) instanceof StreamSortNode);
- assertTrue(getChildrenNode(sinkNode, 5) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(sinkNode, 5);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
+ assertTrue(getChildrenNode(sinkNode, 5) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(sinkNode, 5);
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B2.ZZ", "table1.shenzhen.B1.XX"),
ASC,
0,
@@ -693,7 +699,8 @@ public class SortTest {
.plan(analysis);
logicalPlanNode = logicalQueryPlan.getRootNode();
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
IdentitySinkNode sinkNode =
@@ -720,19 +727,20 @@ public class SortTest {
assertTrue(getChildrenNode(logicalPlanNode, 3) instanceof TopKNode);
assertTrue(getChildrenNode(logicalPlanNode, 4) instanceof ProjectNode);
assertTrue(getChildrenNode(logicalPlanNode, 5) instanceof FilterNode);
- assertTrue(getChildrenNode(logicalPlanNode, 6) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(logicalPlanNode, 6);
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
- assertEquals(8, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
+ assertTrue(getChildrenNode(logicalPlanNode, 6) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(logicalPlanNode, 6);
+ assertEquals("testdb.table1", deviceTableScanNode.getQualifiedObjectName().toString());
+ assertEquals(8, deviceTableScanNode.getAssignments().size());
+ assertEquals(6, deviceTableScanNode.getDeviceEntries().size());
assertTrue(
- tableScanNode.getPushDownLimit() == expectedPushDownLimit
- && tableScanNode.getPushDownOffset() == expectedPushDownOffset);
- assertEquals(isPushLimitToEachDevice, tableScanNode.isPushLimitToEachDevice());
+ deviceTableScanNode.getPushDownLimit() == expectedPushDownLimit
+ && deviceTableScanNode.getPushDownOffset() == expectedPushDownOffset);
+ assertEquals(isPushLimitToEachDevice, deviceTableScanNode.isPushLimitToEachDevice());
// DistributePlan `Identity - Output - Offset - Project - TopK - {Exchange + TopK + Exchange}
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
IdentitySinkNode identitySinkNode =
@@ -748,10 +756,10 @@ public class SortTest {
TopKNode topKNode1 = (TopKNode) topKNode.getChildren().get(1);
assertTrue(getChildrenNode(topKNode1, 1) instanceof ProjectNode);
assertTrue(getChildrenNode(topKNode1, 2) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(topKNode1, 3);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(topKNode1, 3);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
deviceEntries1,
expectedOrdering,
expectedPushDownLimit,
@@ -765,11 +773,11 @@ public class SortTest {
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof TopKNode);
assertTrue(getChildrenNode(identitySinkNode, 2) instanceof ProjectNode);
assertTrue(getChildrenNode(identitySinkNode, 3) instanceof FilterNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 4);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 4);
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
deviceEntries2,
expectedOrdering,
expectedPushDownLimit,
@@ -792,19 +800,20 @@ public class SortTest {
assertTrue(getChildrenNode(logicalPlanNode, 2) instanceof ProjectNode);
assertTrue(getChildrenNode(logicalPlanNode, 3) instanceof TopKNode);
assertTrue(getChildrenNode(logicalPlanNode, 4) instanceof ProjectNode);
- assertTrue(getChildrenNode(logicalPlanNode, 5) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(logicalPlanNode, 5);
- assertEquals("testdb.table1", tableScanNode.getQualifiedObjectName().toString());
- assertEquals(8, tableScanNode.getAssignments().size());
- assertEquals(6, tableScanNode.getDeviceEntries().size());
- assertEquals(4, tableScanNode.getIdAndAttributeIndexMap().size());
- assertEquals(expectedPushDownLimit, tableScanNode.getPushDownLimit());
- assertEquals(expectedPushDownOffset, tableScanNode.getPushDownOffset());
- assertEquals(isPushLimitToEachDevice, tableScanNode.isPushLimitToEachDevice());
+ assertTrue(getChildrenNode(logicalPlanNode, 5) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(logicalPlanNode, 5);
+ assertEquals("testdb.table1", deviceTableScanNode.getQualifiedObjectName().toString());
+ assertEquals(8, deviceTableScanNode.getAssignments().size());
+ assertEquals(6, deviceTableScanNode.getDeviceEntries().size());
+ assertEquals(4, deviceTableScanNode.getIdAndAttributeIndexMap().size());
+ assertEquals(expectedPushDownLimit, deviceTableScanNode.getPushDownLimit());
+ assertEquals(expectedPushDownOffset, deviceTableScanNode.getPushDownOffset());
+ assertEquals(isPushLimitToEachDevice, deviceTableScanNode.isPushLimitToEachDevice());
// DistributePlan `Identity - Output - Offset - Project - TopK - {Exchange + TopK + Exchange}
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
IdentitySinkNode identitySinkNode =
@@ -819,10 +828,10 @@ public class SortTest {
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
TopKNode topKNode1 = (TopKNode) topKNode.getChildren().get(1);
assertTrue(getChildrenNode(topKNode1, 1) instanceof ProjectNode);
- tableScanNode = (TableScanNode) getChildrenNode(topKNode1, 2);
- assertEquals(4, tableScanNode.getDeviceEntries().size());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(topKNode1, 2);
+ assertEquals(4, deviceTableScanNode.getDeviceEntries().size());
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
deviceEntries1,
expectedOrdering,
expectedPushDownLimit,
@@ -835,10 +844,10 @@ public class SortTest {
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof TopKNode);
assertTrue(getChildrenNode(identitySinkNode, 2) instanceof ProjectNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 3);
- assertEquals(2, tableScanNode.getDeviceEntries().size());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 3);
+ assertEquals(2, deviceTableScanNode.getDeviceEntries().size());
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
deviceEntries2,
expectedOrdering,
expectedPushDownLimit,
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SubQueryTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SubQueryTest.java
index dc643543fff..617e96340f2 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SubQueryTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/SubQueryTest.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.db.queryengine.plan.planner.plan.node.sink.IdentitySinkN
import org.apache.iotdb.db.queryengine.plan.relational.planner.SymbolAllocator;
import org.apache.iotdb.db.queryengine.plan.relational.planner.TableLogicalPlanner;
import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributedPlanner;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
@@ -33,7 +34,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TopKNode;
import org.junit.Test;
@@ -62,7 +62,7 @@ public class SubQueryTest {
ProjectNode projectNode;
TableDistributedPlanner distributionPlanner;
DistributedQueryPlan distributedQueryPlan;
- TableScanNode tableScanNode;
+ DeviceTableScanNode deviceTableScanNode;
@Test
public void subQueryTest1() {
@@ -88,11 +88,11 @@ public class SubQueryTest {
assertTrue(getChildrenNode(logicalPlanNode, 2) instanceof LimitNode);
assertTrue(getChildrenNode(logicalPlanNode, 3) instanceof StreamSortNode);
assertTrue(getChildrenNode(logicalPlanNode, 4) instanceof ProjectNode);
- assertTrue(getChildrenNode(logicalPlanNode, 5) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(logicalPlanNode, 5);
- assertEquals(9, tableScanNode.getPushDownLimit());
- assertTrue(tableScanNode.isPushLimitToEachDevice());
- assertEquals("(\"s1\" > 1)", tableScanNode.getPushDownPredicate().toString());
+ assertTrue(getChildrenNode(logicalPlanNode, 5) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(logicalPlanNode, 5);
+ assertEquals(9, deviceTableScanNode.getPushDownLimit());
+ assertTrue(deviceTableScanNode.isPushLimitToEachDevice());
+ assertEquals("(\"s1\" > 1)", deviceTableScanNode.getPushDownPredicate().toString());
/*
* IdentitySinkNode-163
@@ -102,11 +102,12 @@ public class SubQueryTest {
* ├──ExchangeNode-159: [SourceAddress:192.0.12.1/test_query.2.0/161]
* ├──LimitNode-137
* │ └──ProjectNode-118
- * │ └──TableScanNode-115
+ * │ └──DeviceTableScanNode-115
* └──ExchangeNode-160: [SourceAddress:192.0.10.1/test_query.3.0/162]
*/
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
IdentitySinkNode identitySinkNode =
@@ -119,10 +120,10 @@ public class SubQueryTest {
assertTrue(topKNode.getChildren().get(1) instanceof LimitNode);
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
projectNode = (ProjectNode) getChildrenNode(topKNode.getChildren().get(1), 1);
- assertTrue(getChildrenNode(projectNode, 1) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(projectNode, 1);
+ assertTrue(getChildrenNode(projectNode, 1) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(projectNode, 1);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shanghai.A3.YY",
"table1.shenzhen.B1.XX",
@@ -137,16 +138,16 @@ public class SubQueryTest {
* IdentitySinkNode-161
* └──LimitNode-136
* └──ProjectNode-117
- * └──TableScanNode-114
+ * └──DeviceTableScanNode-114
*/
identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof LimitNode);
assertTrue(getChildrenNode(identitySinkNode, 2) instanceof ProjectNode);
- assertTrue(getChildrenNode(identitySinkNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 3);
+ assertTrue(getChildrenNode(identitySinkNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 3);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B1.XX", "table1.shenzhen.B2.ZZ"),
ASC,
9,
@@ -181,11 +182,11 @@ public class SubQueryTest {
assertTrue(getChildrenNode(logicalPlanNode, 4) instanceof ProjectNode);
assertTrue(getChildrenNode(logicalPlanNode, 5) instanceof StreamSortNode);
assertTrue(getChildrenNode(logicalPlanNode, 6) instanceof ProjectNode);
- assertTrue(getChildrenNode(logicalPlanNode, 7) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(logicalPlanNode, 7);
- assertEquals(3, tableScanNode.getPushDownLimit());
- assertTrue(tableScanNode.isPushLimitToEachDevice());
- assertEquals("(\"s1\" > 1)", tableScanNode.getPushDownPredicate().toString());
+ assertTrue(getChildrenNode(logicalPlanNode, 7) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(logicalPlanNode, 7);
+ assertEquals(3, deviceTableScanNode.getPushDownLimit());
+ assertTrue(deviceTableScanNode.isPushLimitToEachDevice());
+ assertEquals("(\"s1\" > 1)", deviceTableScanNode.getPushDownPredicate().toString());
/*
* IdentitySinkNode-199
@@ -197,11 +198,12 @@ public class SubQueryTest {
* ├──ExchangeNode-195: [SourceAddress:192.0.12.1/test_query.2.0/197]
* ├──LimitNode-172 (Notice: child StreamSort has been eliminated)
* │ └──ProjectNode-150
- * │ └──TableScanNode-147
+ * │ └──DeviceTableScanNode-147
* └──ExchangeNode-196: [SourceAddress:192.0.10.1/test_query.3.0/198]
*/
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
IdentitySinkNode identitySinkNode =
@@ -217,10 +219,10 @@ public class SubQueryTest {
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
LimitNode limitNode = (LimitNode) topKNode.getChildren().get(1);
assertTrue(getChildrenNode(limitNode, 1) instanceof ProjectNode);
- assertTrue(getChildrenNode(limitNode, 2) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(limitNode, 2);
+ assertTrue(getChildrenNode(limitNode, 2) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(limitNode, 2);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shenzhen.B1.XX",
"table1.shenzhen.B2.ZZ",
@@ -235,16 +237,16 @@ public class SubQueryTest {
* IdentitySinkNode-161
* └──LimitNode-136
* └──ProjectNode-117
- * └──TableScanNode-114
+ * └──DeviceTableScanNode-114
*/
identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof LimitNode);
assertTrue(getChildrenNode(identitySinkNode, 2) instanceof ProjectNode);
- assertTrue(getChildrenNode(identitySinkNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 3);
+ assertTrue(getChildrenNode(identitySinkNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 3);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B1.XX", "table1.shenzhen.B2.ZZ"),
ASC,
3,
@@ -281,11 +283,11 @@ public class SubQueryTest {
assertTrue(getChildrenNode(logicalPlanNode, 5) instanceof ProjectNode);
assertTrue(getChildrenNode(logicalPlanNode, 6) instanceof StreamSortNode);
assertTrue(getChildrenNode(logicalPlanNode, 7) instanceof ProjectNode);
- assertTrue(getChildrenNode(logicalPlanNode, 8) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(logicalPlanNode, 8);
- assertEquals(3, tableScanNode.getPushDownLimit());
- assertTrue(tableScanNode.isPushLimitToEachDevice());
- assertEquals("(\"s1\" > 1)", tableScanNode.getPushDownPredicate().toString());
+ assertTrue(getChildrenNode(logicalPlanNode, 8) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(logicalPlanNode, 8);
+ assertEquals(3, deviceTableScanNode.getPushDownLimit());
+ assertTrue(deviceTableScanNode.isPushLimitToEachDevice());
+ assertEquals("(\"s1\" > 1)", deviceTableScanNode.getPushDownPredicate().toString());
/*
* IdentitySinkNode-199
@@ -297,7 +299,7 @@ public class SubQueryTest {
* ├──ExchangeNode-195: [SourceAddress:192.0.12.1/test_query.2.0/197]
* ├──LimitNode-172 (Notice: child StreamSort has been eliminated)
* │ └──ProjectNode-150
- * │ └──TableScanNode-147
+ * │ └──DeviceTableScanNode-147
* └──ExchangeNode-196: [SourceAddress:192.0.10.1/test_query.3.0/198]
*/
/*
@@ -311,11 +313,12 @@ public class SubQueryTest {
* ├──ExchangeNode-201: [SourceAddress:192.0.12.1/test_query.2.0/203]
* ├──LimitNode-177
* │ └──ProjectNode-154
- * │ └──TableScanNode-151
+ * │ └──DeviceTableScanNode-151
* └──ExchangeNode-202: [SourceAddress:192.0.10.1/test_query.3.0/204]
*/
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
IdentitySinkNode identitySinkNode =
@@ -332,10 +335,10 @@ public class SubQueryTest {
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
LimitNode limitNode = (LimitNode) topKNode.getChildren().get(1);
assertTrue(getChildrenNode(limitNode, 1) instanceof ProjectNode);
- assertTrue(getChildrenNode(limitNode, 2) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(limitNode, 2);
+ assertTrue(getChildrenNode(limitNode, 2) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(limitNode, 2);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shenzhen.B1.XX",
"table1.shenzhen.B2.ZZ",
@@ -350,16 +353,16 @@ public class SubQueryTest {
* IdentitySinkNode-161
* └──LimitNode-136
* └──ProjectNode-117
- * └──TableScanNode-114
+ * └──DeviceTableScanNode-114
*/
identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof LimitNode);
assertTrue(getChildrenNode(identitySinkNode, 2) instanceof ProjectNode);
- assertTrue(getChildrenNode(identitySinkNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 3);
+ assertTrue(getChildrenNode(identitySinkNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 3);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B1.XX", "table1.shenzhen.B2.ZZ"),
ASC,
3,
@@ -401,15 +404,15 @@ public class SubQueryTest {
ProjectNode.class,
StreamSortNode.class,
ProjectNode.class,
- TableScanNode.class);
+ DeviceTableScanNode.class);
assertEquals(
"(\"s1\" > 1)",
((FilterNode) getChildrenNode(logicalPlanNode, 4)).getPredicate().toString());
assertEquals(3, ((LimitNode) getChildrenNode(logicalPlanNode, 5)).getCount());
- tableScanNode = (TableScanNode) getChildrenNode(logicalPlanNode, 9);
- assertEquals(3, tableScanNode.getPushDownLimit());
- assertTrue(tableScanNode.isPushLimitToEachDevice());
- assertEquals("(\"s1\" > 1)", tableScanNode.getPushDownPredicate().toString());
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(logicalPlanNode, 9);
+ assertEquals(3, deviceTableScanNode.getPushDownLimit());
+ assertTrue(deviceTableScanNode.isPushLimitToEachDevice());
+ assertEquals("(\"s1\" > 1)", deviceTableScanNode.getPushDownPredicate().toString());
/*
* IdentitySinkNode-219
@@ -423,11 +426,12 @@ public class SubQueryTest {
* ├──ExchangeNode-215: [SourceAddress:192.0.12.1/test_query.2.0/217]
* ├──LimitNode-190
* │ └──ProjectNode-166
- * │ └──TableScanNode-163
+ * │ └──DeviceTableScanNode-163
* └──ExchangeNode-216: [SourceAddress:192.0.10.1/test_query.3.0/218]
*/
distributionPlanner =
- new TableDistributedPlanner(analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA);
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, logicalQueryPlan, TEST_MATADATA, null);
distributedQueryPlan = distributionPlanner.plan();
assertEquals(3, distributedQueryPlan.getFragments().size());
IdentitySinkNode identitySinkNode =
@@ -448,10 +452,10 @@ public class SubQueryTest {
assertTrue(topKNode.getChildren().get(2) instanceof ExchangeNode);
LimitNode limitNode = (LimitNode) topKNode.getChildren().get(1);
assertTrue(getChildrenNode(limitNode, 1) instanceof ProjectNode);
- assertTrue(getChildrenNode(limitNode, 2) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(limitNode, 2);
+ assertTrue(getChildrenNode(limitNode, 2) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(limitNode, 2);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList(
"table1.shenzhen.B1.XX",
"table1.shenzhen.B2.ZZ",
@@ -466,16 +470,16 @@ public class SubQueryTest {
* IdentitySinkNode-161
* └──LimitNode-136
* └──ProjectNode-117
- * └──TableScanNode-114
+ * └──DeviceTableScanNode-114
*/
identitySinkNode =
(IdentitySinkNode) distributedQueryPlan.getFragments().get(1).getPlanNodeTree();
assertTrue(getChildrenNode(identitySinkNode, 1) instanceof LimitNode);
assertTrue(getChildrenNode(identitySinkNode, 2) instanceof ProjectNode);
- assertTrue(getChildrenNode(identitySinkNode, 3) instanceof TableScanNode);
- tableScanNode = (TableScanNode) getChildrenNode(identitySinkNode, 3);
+ assertTrue(getChildrenNode(identitySinkNode, 3) instanceof DeviceTableScanNode);
+ deviceTableScanNode = (DeviceTableScanNode) getChildrenNode(identitySinkNode, 3);
assertTableScan(
- tableScanNode,
+ deviceTableScanNode,
Arrays.asList("table1.shenzhen.B1.XX", "table1.shenzhen.B2.ZZ"),
ASC,
3,
@@ -495,10 +499,17 @@ public class SubQueryTest {
QUERY_CONTEXT, TEST_MATADATA, SESSION_INFO, symbolAllocator, DEFAULT_WARNING)
.plan(analysis)
.getRootNode();
- assertNodeMatches(logicalPlanNode, OutputNode.class, TableScanNode.class);
- TableScanNode tableScanNode = (TableScanNode) getChildrenNode(logicalPlanNode, 1);
+ assertNodeMatches(logicalPlanNode, OutputNode.class, DeviceTableScanNode.class);
+ DeviceTableScanNode deviceTableScanNode =
+ (DeviceTableScanNode) getChildrenNode(logicalPlanNode, 1);
assertTableScan(
- tableScanNode, ALL_DEVICE_ENTRIES, ASC, 0, 0, true, "((\"s1\" > 1) AND (\"s2\" > 2))");
+ deviceTableScanNode,
+ ALL_DEVICE_ENTRIES,
+ ASC,
+ 0,
+ 0,
+ true,
+ "((\"s1\" > 1) AND (\"s2\" > 2))");
}
// test MergeLimits
@@ -512,10 +523,12 @@ public class SubQueryTest {
QUERY_CONTEXT, TEST_MATADATA, SESSION_INFO, symbolAllocator, DEFAULT_WARNING)
.plan(analysis)
.getRootNode();
- assertNodeMatches(logicalPlanNode, OutputNode.class, LimitNode.class, TableScanNode.class);
+ assertNodeMatches(
+ logicalPlanNode, OutputNode.class, LimitNode.class, DeviceTableScanNode.class);
LimitNode limitNode = (LimitNode) getChildrenNode(logicalPlanNode, 1);
assertEquals(5, limitNode.getCount());
- TableScanNode tableScanNode = (TableScanNode) getChildrenNode(logicalPlanNode, 2);
- assertTableScan(tableScanNode, ALL_DEVICE_ENTRIES, ASC, 5, 0, false);
+ DeviceTableScanNode deviceTableScanNode =
+ (DeviceTableScanNode) getChildrenNode(logicalPlanNode, 2);
+ assertTableScan(deviceTableScanNode, ALL_DEVICE_ENTRIES, ASC, 5, 0, false);
}
}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java
index a1a7b9ef363..a9faa30b673 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java
@@ -19,6 +19,8 @@ import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition;
import org.apache.iotdb.commons.partition.SchemaPartition;
import org.apache.iotdb.commons.path.PathPatternTree;
+import org.apache.iotdb.commons.schema.table.InformationSchemaTable;
+import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
import org.apache.iotdb.commons.udf.builtin.BuiltinAggregationFunction;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
@@ -48,6 +50,7 @@ import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.file.metadata.StringArrayDeviceID;
import org.apache.tsfile.read.common.type.StringType;
import org.apache.tsfile.read.common.type.Type;
+import org.apache.tsfile.read.common.type.TypeFactory;
import java.util.Arrays;
import java.util.Collections;
@@ -55,7 +58,9 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
+import static org.apache.iotdb.commons.schema.table.InformationSchemaTable.INFORMATION_SCHEMA;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTableModelDataPartition.DEVICE_1;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTableModelDataPartition.DEVICE_1_ATTRIBUTES;
import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTableModelDataPartition.DEVICE_2;
@@ -113,6 +118,24 @@ public class TestMatadata implements Metadata {
@Override
public Optional<TableSchema> getTableSchema(SessionInfo session, QualifiedObjectName name) {
+ if (name.getDatabaseName().equals(INFORMATION_SCHEMA)) {
+ TsTable table = InformationSchemaTable.getTableFromStringValue(name.getObjectName());
+ if (table == null) {
+ return Optional.empty();
+ }
+ List<ColumnSchema> columnSchemaList =
+ table.getColumnList().stream()
+ .map(
+ o ->
+ new ColumnSchema(
+ o.getColumnName(),
+ TypeFactory.getType(o.getDataType()),
+ false,
+ o.getColumnCategory()))
+ .collect(Collectors.toList());
+ return Optional.of(new TableSchema(table.getTableName(), columnSchemaList));
+ }
+
List<ColumnSchema> columnSchemas =
Arrays.asList(
ColumnSchema.builder(TIME_CM).setColumnCategory(TsTableColumnCategory.TIME).build(),
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestPlanBuilder.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestPlanBuilder.java
index 4101d092efa..13518eb18f9 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestPlanBuilder.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestPlanBuilder.java
@@ -25,12 +25,12 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.DeviceEntry;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.QualifiedObjectName;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Assignments;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OffsetNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
@@ -72,7 +72,7 @@ public class TestPlanBuilder {
return this;
}
- public TestPlanBuilder tableScan(
+ public TestPlanBuilder deviceTableScan(
String id,
QualifiedObjectName qualifiedObjectName,
List<Symbol> outputSymbols,
@@ -86,7 +86,7 @@ public class TestPlanBuilder {
long pushDownOffset,
boolean pushLimitToEachDevice) {
this.root =
- new TableScanNode(
+ new DeviceTableScanNode(
new PlanNodeId(id),
qualifiedObjectName,
outputSymbols,
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestUtils.java
index e0628feff9a..a7c01459d70 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestUtils.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestUtils.java
@@ -27,11 +27,11 @@ import org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
import org.apache.iotdb.db.queryengine.plan.statement.component.Ordering;
@@ -79,7 +79,7 @@ public class TestUtils {
public static final List<String> BEIJING_A1_DEVICE_ENTRY = Collections.singletonList(DEVICE_1);
public static void assertTableScan(
- TableScanNode tableScanNode,
+ DeviceTableScanNode deviceTableScanNode,
List<String> deviceEntries,
Ordering ordering,
long pushLimit,
@@ -88,30 +88,36 @@ public class TestUtils {
String pushDownFilter) {
assertEquals(
deviceEntries,
- tableScanNode.getDeviceEntries().stream()
+ deviceTableScanNode.getDeviceEntries().stream()
.map(d -> d.getDeviceID().toString())
.collect(Collectors.toList()));
- assertEquals(ordering, tableScanNode.getScanOrder());
- assertEquals(pushLimit, tableScanNode.getPushDownLimit());
- assertEquals(pushOffset, tableScanNode.getPushDownOffset());
- if (tableScanNode.getPushDownLimit() > 0) {
- assertEquals(pushLimitToEachDevice, tableScanNode.isPushLimitToEachDevice());
+ assertEquals(ordering, deviceTableScanNode.getScanOrder());
+ assertEquals(pushLimit, deviceTableScanNode.getPushDownLimit());
+ assertEquals(pushOffset, deviceTableScanNode.getPushDownOffset());
+ if (deviceTableScanNode.getPushDownLimit() > 0) {
+ assertEquals(pushLimitToEachDevice, deviceTableScanNode.isPushLimitToEachDevice());
}
if (!pushDownFilter.isEmpty()) {
- assert tableScanNode.getPushDownPredicate() != null;
- assertEquals(pushDownFilter, tableScanNode.getPushDownPredicate().toString());
+ assert deviceTableScanNode.getPushDownPredicate() != null;
+ assertEquals(pushDownFilter, deviceTableScanNode.getPushDownPredicate().toString());
}
}
public static void assertTableScan(
- TableScanNode tableScanNode,
+ DeviceTableScanNode deviceTableScanNode,
List<String> deviceEntries,
Ordering ordering,
long pushLimit,
long pushOffset,
boolean pushLimitToEachDevice) {
assertTableScan(
- tableScanNode, deviceEntries, ordering, pushLimit, pushOffset, pushLimitToEachDevice, "");
+ deviceTableScanNode,
+ deviceEntries,
+ ordering,
+ pushLimit,
+ pushOffset,
+ pushLimitToEachDevice,
+ "");
}
public static void assertMergeSortNode(MergeSortNode mergeSortNode) {
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCacheTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCacheTest.java
index 5451042b71b..edd3e67211b 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCacheTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TableDeviceSchemaCacheTest.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher.cache;
+import org.apache.iotdb.commons.schema.column.ColumnHeader;
import org.apache.iotdb.commons.schema.table.TsTable;
import org.apache.iotdb.commons.schema.table.column.AttributeColumnSchema;
import org.apache.iotdb.commons.schema.table.column.IdColumnSchema;
@@ -26,7 +27,6 @@ import org.apache.iotdb.commons.schema.table.column.MeasurementColumnSchema;
import org.apache.iotdb.commons.schema.table.column.TimeColumnSchema;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.queryengine.common.header.ColumnHeader;
import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
import org.apache.tsfile.common.conf.TSFileConfig;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanTester.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanTester.java
index e8862d61a19..1448a97962d 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanTester.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/PlanTester.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.queryengine.plan.relational.planner;
+import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.queryengine.common.MPPQueryContext;
@@ -36,11 +37,14 @@ import org.apache.iotdb.db.queryengine.plan.relational.analyzer.TestMatadata;
import org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.distribute.TableDistributedPlanner;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.DataNodeLocationSupplierFactory;
import org.apache.iotdb.db.queryengine.plan.relational.planner.optimizations.PlanOptimizer;
import org.apache.iotdb.db.queryengine.plan.relational.security.AllowAllAccessControl;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
import org.apache.iotdb.db.queryengine.plan.relational.sql.parser.SqlParser;
+import org.apache.iotdb.db.queryengine.plan.relational.sql.rewrite.StatementRewriteFactory;
+import com.google.common.collect.ImmutableList;
import org.mockito.Mockito;
import java.time.ZoneId;
@@ -48,6 +52,7 @@ import java.util.Collections;
import java.util.List;
import static org.apache.iotdb.db.queryengine.execution.warnings.WarningCollector.NOOP;
+import static org.apache.iotdb.db.queryengine.plan.relational.analyzer.MockTableModelDataPartition.genDataNodeLocation;
import static org.apache.iotdb.db.queryengine.plan.relational.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
import static org.junit.Assert.fail;
@@ -71,6 +76,20 @@ public class PlanTester {
private LogicalQueryPlan plan;
+ private final DataNodeLocationSupplierFactory.DataNodeLocationSupplier dataNodeLocationSupplier =
+ new DataNodeLocationSupplierFactory.DataNodeLocationSupplier() {
+ @Override
+ public List<TDataNodeLocation> getDataNodeLocations(String table) {
+ switch (table) {
+ case "queries":
+ return ImmutableList.of(
+ genDataNodeLocation(1, "192.0.1.1"), genDataNodeLocation(2, "192.0.1.2"));
+ default:
+ throw new UnsupportedOperationException();
+ }
+ }
+ };
+
public PlanTester() {
this(new TestMatadata());
}
@@ -162,6 +181,7 @@ public class PlanTester {
statementAnalyzerFactory,
Collections.emptyList(),
Collections.emptyMap(),
+ new StatementRewriteFactory(metadata).getStatementRewrite(),
NOOP);
return analyzer.analyze(statement);
} catch (Exception e) {
@@ -175,7 +195,9 @@ public class PlanTester {
public PlanNode getFragmentPlan(int index) {
if (distributedQueryPlan == null) {
distributedQueryPlan =
- new TableDistributedPlanner(analysis, symbolAllocator, plan, metadata).plan();
+ new TableDistributedPlanner(
+ analysis, symbolAllocator, plan, metadata, dataNodeLocationSupplier)
+ .plan();
}
return distributedQueryPlan.getFragments().get(index).getPlanNodeTree().getChildren().get(0);
}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java
similarity index 98%
rename from iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationTableScanMatcher.java
rename to iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java
index cc15d2bbbe0..22fb627f460 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationTableScanMatcher.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/AggregationDeviceTableScanMatcher.java
@@ -35,14 +35,14 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.MatchResult.NO_MATCH;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.MatchResult.match;
-public class AggregationTableScanMatcher extends TableScanMatcher {
+public class AggregationDeviceTableScanMatcher extends DeviceTableScanMatcher {
private final PlanMatchPattern.GroupingSetDescriptor groupingSets;
private final List<String> masks;
private final List<String> preGroupedSymbols;
private final Optional<Symbol> groupId;
private final AggregationNode.Step step;
- public AggregationTableScanMatcher(
+ public AggregationDeviceTableScanMatcher(
PlanMatchPattern.GroupingSetDescriptor groupingSets,
List<String> preGroupedSymbols,
List<String> masks,
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ColumnReference.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ColumnReference.java
index bada50edb5c..61fcd2b2bb4 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ColumnReference.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/ColumnReference.java
@@ -19,7 +19,7 @@ import org.apache.iotdb.db.queryengine.plan.relational.metadata.ColumnSchema;
import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
import org.apache.iotdb.db.queryengine.plan.relational.planner.Symbol;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import java.util.Map;
import java.util.Optional;
@@ -43,10 +43,10 @@ public class ColumnReference implements RvalueMatcher {
String actualTableName;
Map<Symbol, ColumnSchema> assignments;
- if (node instanceof TableScanNode) {
- TableScanNode tableScanNode = (TableScanNode) node;
- actualTableName = tableScanNode.getQualifiedObjectName().toString();
- assignments = tableScanNode.getAssignments();
+ if (node instanceof DeviceTableScanNode) {
+ DeviceTableScanNode deviceTableScanNode = (DeviceTableScanNode) node;
+ actualTableName = deviceTableScanNode.getQualifiedObjectName().toString();
+ assignments = deviceTableScanNode.getAssignments();
}
/*else if (node instanceof IndexSourceNode indexSourceNode) {
tableHandle = indexSourceNode.getTableHandle();
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/DeviceTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/DeviceTableScanMatcher.java
new file mode 100644
index 00000000000..e9d0fe71149
--- /dev/null
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/DeviceTableScanMatcher.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions;
+
+import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+
+public class DeviceTableScanMatcher extends TableScanMatcher {
+
+ public DeviceTableScanMatcher(
+ String expectedTableName,
+ Optional<Boolean> hasTableLayout,
+ List<String> outputSymbols,
+ Set<String> assignmentsKeys) {
+ super(expectedTableName, hasTableLayout, outputSymbols, assignmentsKeys);
+ }
+
+ @Override
+ public boolean shapeMatches(PlanNode node) {
+ return node instanceof DeviceTableScanNode;
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(this)
+ .omitNullValues()
+ .add("expectedTableName", expectedTableName)
+ .add("hasTableLayout", hasTableLayout.orElse(null))
+ .add("outputSymbols", outputSymbols)
+ .add("assignmentsKeys", assignmentsKeys)
+ .toString();
+ }
+}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/InformationSchemaTableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/InformationSchemaTableScanMatcher.java
new file mode 100644
index 00000000000..4428a322495
--- /dev/null
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/InformationSchemaTableScanMatcher.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.iotdb.db.queryengine.plan.relational.planner.assertions;
+
+import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
+import org.apache.iotdb.db.queryengine.common.SessionInfo;
+import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNode;
+import org.apache.iotdb.db.queryengine.plan.relational.metadata.Metadata;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+
+import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.gson.internal.$Gson$Preconditions.checkArgument;
+import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.MatchResult.NO_MATCH;
+
+public class InformationSchemaTableScanMatcher extends TableScanMatcher {
+ private final Optional<Integer> dataNodeId;
+
+ public InformationSchemaTableScanMatcher(
+ String expectedTableName,
+ Optional<Boolean> hasTableLayout,
+ List<String> outputSymbols,
+ Set<String> assignmentsKeys,
+ Optional<Integer> dataNodeId) {
+ super(expectedTableName, hasTableLayout, outputSymbols, assignmentsKeys);
+ this.dataNodeId = dataNodeId;
+ }
+
+ @Override
+ public boolean shapeMatches(PlanNode node) {
+ return node instanceof InformationSchemaTableScanNode;
+ }
+
+ @Override
+ public MatchResult detailMatches(
+ PlanNode node, SessionInfo sessionInfo, Metadata metadata, SymbolAliases symbolAliases) {
+ if (super.detailMatches(node, sessionInfo, metadata, symbolAliases) == NO_MATCH) {
+ return NO_MATCH;
+ }
+
+ InformationSchemaTableScanNode tableScanNode = (InformationSchemaTableScanNode) node;
+
+ TRegionReplicaSet regionReplicaSet = tableScanNode.getRegionReplicaSet();
+ Integer actual = null;
+ if (regionReplicaSet != null) {
+ checkArgument(regionReplicaSet.getDataNodeLocations().size() == 1);
+ actual = regionReplicaSet.getDataNodeLocations().get(0).getDataNodeId();
+ }
+ if (!Objects.equals(actual, dataNodeId.orElse(null))) {
+ return NO_MATCH;
+ }
+
+ return new MatchResult(true);
+ }
+
+ @Override
+ public String toString() {
+ return toStringHelper(this)
+ .omitNullValues()
+ .add("expectedTableName", expectedTableName)
+ .add("hasTableLayout", hasTableLayout.orElse(null))
+ .add("outputSymbols", outputSymbols)
+ .add("assignmentsKeys", assignmentsKeys)
+ .add("dataNodeId", dataNodeId.orElse(null))
+ .toString();
+ }
+}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchPattern.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchPattern.java
index 1b5708c4d40..09740bdbed3 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchPattern.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/PlanMatchPattern.java
@@ -22,9 +22,11 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.iterative.GroupRe
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.AggregationTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.CollectNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.DeviceTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.EnforceSingleRowNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ExchangeNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.FilterNode;
+import org.apache.iotdb.db.queryengine.plan.relational.planner.node.InformationSchemaTableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.JoinNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.LimitNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.MergeSortNode;
@@ -33,7 +35,6 @@ import org.apache.iotdb.db.queryengine.plan.relational.planner.node.OutputNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.ProjectNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.SortNode;
import org.apache.iotdb.db.queryengine.plan.relational.planner.node.StreamSortNode;
-import org.apache.iotdb.db.queryengine.plan.relational.planner.node.TableScanNode;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.DataType;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Expression;
import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.SortItem;
@@ -112,11 +113,22 @@ public final class PlanMatchPattern {
Optional.empty(),
Optional.empty()));
}*/
+ public static PlanMatchPattern infoSchemaTableScan(
+ String expectedTableName, Optional<Integer> dataNodeId) {
+ return node(InformationSchemaTableScanNode.class)
+ .with(
+ new InformationSchemaTableScanMatcher(
+ expectedTableName,
+ Optional.empty(),
+ Collections.emptyList(),
+ Collections.emptySet(),
+ dataNodeId));
+ }
public static PlanMatchPattern tableScan(String expectedTableName) {
- return node(TableScanNode.class)
+ return node(DeviceTableScanNode.class)
.with(
- new TableScanMatcher(
+ new DeviceTableScanMatcher(
expectedTableName,
Optional.empty(),
Collections.emptyList(),
@@ -126,9 +138,9 @@ public final class PlanMatchPattern {
public static PlanMatchPattern tableScan(
String expectedTableName, List<String> outputSymbols, Set<String> assignmentsKeys) {
PlanMatchPattern pattern =
- node(TableScanNode.class)
+ node(DeviceTableScanNode.class)
.with(
- new TableScanMatcher(
+ new DeviceTableScanMatcher(
expectedTableName, Optional.empty(), outputSymbols, assignmentsKeys));
outputSymbols.forEach(
symbol -> pattern.withAlias(symbol, new ColumnReference(expectedTableName, symbol)));
@@ -271,7 +283,7 @@ public final class PlanMatchPattern {
PlanMatchPattern result = node(AggregationTableScanNode.class);
result.with(
- new AggregationTableScanMatcher(
+ new AggregationDeviceTableScanMatcher(
groupingSets,
preGroupedSymbols,
ImmutableList.of(),
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAliases.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAliases.java
index ba27c4adf0a..45c6242e85b 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAliases.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/SymbolAliases.java
@@ -155,7 +155,7 @@ public final class SymbolAliases {
* Example in the context of a Plan:
* PlanMatchPattern.tableScan("nation", ImmutableMap.of("NK", "nationkey", "RK", "regionkey")
* applied to
- * TableScanNode { col1 := ColumnHandle(nation, nationkey), col2 := ColumnHandle(nation, regionkey) }
+ * DeviceTableScanNode { col1 := ColumnHandle(nation, nationkey), col2 := ColumnHandle(nation, regionkey) }
* gives SymbolAliases.map
* { "NK": SymbolReference("col1"), "RK": SymbolReference("col2") }
*
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableScanMatcher.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableScanMatcher.java
index 6b8724a87ea..44fc845458c 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableScanMatcher.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/TableScanMatcher.java
@@ -24,12 +24,11 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkState;
import static java.util.Objects.requireNonNull;
import static org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.MatchResult.NO_MATCH;
-public class TableScanMatcher implements Matcher {
+public abstract class TableScanMatcher implements Matcher {
protected final String expectedTableName;
protected final Optional<Boolean> hasTableLayout;
// this field empty means no need to match
@@ -48,11 +47,6 @@ public class TableScanMatcher implements Matcher {
this.assignmentsKeys = requireNonNull(assignmentsKeys, "assignmentsKeys is null");
}
- @Override
- public boolean shapeMatches(PlanNode node) {
- return node instanceof TableScanNode;
- }
-
@Override
public MatchResult detailMatches(
PlanNode node, SessionInfo sessionInfo, Metadata metadata, SymbolAliases symbolAliases) {
@@ -87,15 +81,4 @@ public class TableScanMatcher implements Matcher {
return new MatchResult(true);
}
-
- @Override
- public String toString() {
- return toStringHelper(this)
- .omitNullValues()
- .add("expectedTableName", expectedTableName)
- .add("hasTableLayout", hasTableLayout.orElse(null))
- .add("outputSymbols", outputSymbols)
- .add("assignmentsKeys", assignmentsKeys)
- .toString();
- }
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeader.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeader.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeader.java
rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeader.java
index dff3becd51b..30297ebac01 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeader.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeader.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.common.header;
+package org.apache.iotdb.commons.schema.column;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeaderConstant.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeaderConstant.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeaderConstant.java
rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeaderConstant.java
index bc87b710a6e..81f5de255f5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/common/header/ColumnHeaderConstant.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/column/ColumnHeaderConstant.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.queryengine.common.header;
+package org.apache.iotdb.commons.schema.column;
import com.google.common.collect.ImmutableList;
import org.apache.tsfile.enums.TSDataType;
@@ -197,6 +197,11 @@ public class ColumnHeaderConstant {
public static final String ELAPSED_TIME = "ElapsedTime";
public static final String STATEMENT = "Statement";
+ public static final String QUERY_ID_TABLE_MODEL = "query_id";
+ public static final String DATA_NODE_ID_TABLE_MODEL = "datanode_id";
+ public static final String ELAPSED_TIME_TABLE_MODEL = "elapsed_time";
+ public static final String SQL_DIALECT = "sql_dialect";
+
// column names for show space quota
public static final String QUOTA_TYPE = "QuotaType";
public static final String LIMIT = "Limit";
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchemaTable.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchemaTable.java
new file mode 100644
index 00000000000..75c6e1d65a1
--- /dev/null
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/InformationSchemaTable.java
@@ -0,0 +1,96 @@
+package org.apache.iotdb.commons.schema.table;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
+import org.apache.iotdb.commons.schema.table.column.MeasurementColumnSchema;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.tsfile.enums.TSDataType;
+import org.apache.tsfile.file.metadata.enums.CompressionType;
+import org.apache.tsfile.file.metadata.enums.TSEncoding;
+
+import java.util.Locale;
+
+public enum InformationSchemaTable {
+ QUERIES(
+ new TsTable(
+ "queries",
+ ImmutableList.of(
+ new MeasurementColumnSchema(
+ ColumnHeaderConstant.TIME,
+ TSDataType.TIMESTAMP,
+ TSEncoding.PLAIN,
+ CompressionType.UNCOMPRESSED),
+ new MeasurementColumnSchema(
+ ColumnHeaderConstant.QUERY_ID_TABLE_MODEL,
+ TSDataType.STRING,
+ TSEncoding.PLAIN,
+ CompressionType.UNCOMPRESSED),
+ new MeasurementColumnSchema(
+ ColumnHeaderConstant.DATA_NODE_ID_TABLE_MODEL,
+ TSDataType.INT32,
+ TSEncoding.PLAIN,
+ CompressionType.UNCOMPRESSED),
+ new MeasurementColumnSchema(
+ ColumnHeaderConstant.ELAPSED_TIME_TABLE_MODEL,
+ TSDataType.FLOAT,
+ TSEncoding.PLAIN,
+ CompressionType.UNCOMPRESSED),
+ new MeasurementColumnSchema(
+ ColumnHeaderConstant.STATEMENT,
+ TSDataType.STRING,
+ TSEncoding.PLAIN,
+ CompressionType.UNCOMPRESSED),
+ new MeasurementColumnSchema(
+ ColumnHeaderConstant.SQL_DIALECT,
+ TSDataType.STRING,
+ TSEncoding.PLAIN,
+ CompressionType.UNCOMPRESSED))));
+
+ public static final String INFORMATION_SCHEMA = "information_schema";
+
+ private final TsTable table;
+
+ InformationSchemaTable(TsTable table) {
+ this.table = table;
+ }
+
+ public TsTable getTableMetadata() {
+ return table;
+ }
+
+ public String getSchemaTableName() {
+ return table.getTableName();
+ }
+
+ public InformationSchemaTable fromStringValue(String value) {
+ return valueOf(value);
+ }
+
+ public static TsTable getTableFromStringValue(String value) {
+ try {
+ return valueOf(value.toUpperCase(Locale.ENGLISH)).table;
+ } catch (IllegalArgumentException e) {
+ // No matched table
+ return null;
+ }
+ }
+}
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java
index 4070fc21580..5f658aebc52 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java
@@ -27,6 +27,7 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema;
import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchemaUtil;
import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
+import com.google.common.collect.ImmutableList;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.ReadWriteIOUtils;
@@ -79,6 +80,13 @@ public class TsTable {
columnSchemaMap.put(TIME_COLUMN_NAME, TIME_COLUMN_SCHEMA);
}
+ // This interface is used by InformationSchema table, so time column is not necessary
+ public TsTable(String tableName, ImmutableList<TsTableColumnSchema> columnSchemas) {
+ this.tableName = tableName;
+ columnSchemas.forEach(
+ columnSchema -> columnSchemaMap.put(columnSchema.getColumnName(), columnSchema));
+ }
+
public String getTableName() {
return tableName;
}